Changeset 1f1eb58 in network-game

Timestamp:

Jul 14, 2013, 4:11:25 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

5a64bea

Parents:

1a3c42d

Message:

Added a client release build that uses the release version of allegro

Location:

client

Files:

• .gitignore (modified) (1 diff)
• Client/Client.vcxproj (modified) (2 diffs)
• Client/Client.vcxproj.user (modified) (1 diff)
• Client/main.cpp (modified) (9 diffs)

client/.gitignore

@@ -1 +1 @@
 Debug/
+Release/
 ipch/
 Client.suo

client/Client/Client.vcxproj

@@ -56 +56 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>c:\allegro\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -61 +62 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>c:\allegro\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>allegro-5.0.8-monolith-md.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

client/Client/Client.vcxproj.user

@@ -6 +6 @@
     <LocalDebuggerEnvironment>PATH=c:\allegro\bin;%PATH%</LocalDebuggerEnvironment>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>medievaltech.com 10000</LocalDebuggerCommandArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerEnvironment>PATH=c:\allegro\bin;%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>

client/Client/main.cpp

@@ -52 +52 @@
 POSITION screenToMap(POSITION pos);
 POSITION mapToScreen(POSITION pos);
+int getRefreshRate(int width, int height);
 
 // callbacks
@@ -100 +101 @@
 string username;
 chat chatConsole;
- 
+
 int main(int argc, char **argv)
 {
@@ -113 +114 @@
    unsigned int curPlayerId = -1;
    int scoreBlue, scoreRed;
+   bool fullscreen = false;
 
    scoreBlue = 0;
@@ -160 +162 @@
    }
  
-  display = al_create_display(SCREEN_W, SCREEN_H);
+   int refreshRate = getRefreshRate(SCREEN_W, SCREEN_H);
+   // if the computer doesn't support this resolution, just use windowed mode
+   if (refreshRate > 0 && fullscreen) {
+      al_set_new_display_flags(ALLEGRO_FULLSCREEN);
+      al_set_new_display_refresh_rate(refreshRate);
+   }
+   display = al_create_display(SCREEN_W, SCREEN_H);
    if(!display) {
       fprintf(stderr, "failed to create display!\n");
@@ -446 +454 @@
    return 0;
 }
+
+
 
 // need to make a function like this that works on windows
@@ -550 +560 @@
 
                   cout << "Got a valid login response with the player" << endl;
-                  cout << "Player id: " << curPlayerId << endl; 
+                  cout << "Player id: " << curPlayerId << endl;
+                  cout << "Player health: " << p.health << endl;
                   cout << "map size: " << mapPlayers.size() << endl;
                }
@@ -611 +622 @@
             case MSG_TYPE_PLAYER:
             {
+               cout << "Received MSG_TYPE_PLAYER" << endl;
+
                Player p("", "");
                p.deserialize(msg.buffer);
@@ -620 +633 @@
                   p.isDead = false;
 
+               cout << mapPlayers[p.id].pos.x << ", " << mapPlayers[p.id].pos.y << endl;
+               cout << "health:" << mapPlayers[p.id].health << endl;
+               cout << "is dead?:" << mapPlayers[p.id].isDead << endl;
                mapPlayers[p.id] = p;
+               cout << mapPlayers[p.id].pos.x << ", " << mapPlayers[p.id].pos.y << endl;
+               cout << "health:" << mapPlayers[p.id].health << endl;
+               cout << "is dead?:" << mapPlayers[p.id].isDead << endl;
 
                break;
@@ -956 +975 @@
    sendMessage(&msgTo, sock, &server);
 }
+
+int getRefreshRate(int width, int height) {
+   int numRefreshRates = al_get_num_display_modes();
+   ALLEGRO_DISPLAY_MODE displayMode;
+
+   for(int i=0; i<numRefreshRates; i++) {
+      al_get_display_mode(i, &displayMode);
+
+      if (displayMode.width == width && displayMode.height == height)
+         return displayMode.refresh_rate;
+   }
+
+   return 0;
+}