Engine:
authorsmxx
Mon, 29 Mar 2010 20:40:33 +0000
changeset 3162 663e0e55e5c7
parent 3161 cb5f04cc9d76
child 3163 fdc351144b5e
Engine: * Reenabled centering of non-fullscreen window under Win32 Frontend: * Ensure different team names as well as hats in quick games
QTfrontend/game.cpp
hedgewars/hwengine.pas
--- a/QTfrontend/game.cpp	Mon Mar 29 20:32:35 2010 +0000
+++ b/QTfrontend/game.cpp	Mon Mar 29 20:40:33 2010 +0000
@@ -124,7 +124,7 @@
     team2->numHedgehogs = 4;
 	do
         namegen.TeamRandomNames(team2,TRUE);
-	while(!team2->TeamName.compare(team1->TeamName));
+	while(!team2->TeamName.compare(team1->TeamName) || !team2->HHHat[0].compare(team1->HHHat[0]));
     HWProto::addStringListToBuffer(teamscfg,
             team2->TeamGameConfig(100));
 
--- a/hedgewars/hwengine.pas	Mon Mar 29 20:32:35 2010 +0000
+++ b/hedgewars/hwengine.pas	Mon Mar 29 20:40:33 2010 +0000
@@ -267,11 +267,14 @@
     SDLTry(TTF_Init() <> -1, true);
     WriteLnToConsole(msgOK);
 
-    (*s:= SDL_getenv('SDL_VIDEO_CENTERED');
+{$IFDEF WIN32}
+    s:= SDL_getenv('SDL_VIDEO_CENTERED');
     SDL_putenv('SDL_VIDEO_CENTERED=1');
     ShowMainWindow();
-    SDL_putenv(str2pchar('SDL_VIDEO_CENTERED=' + s));*)
+    SDL_putenv(str2pchar('SDL_VIDEO_CENTERED=' + s));
+{$ELSE}
     ShowMainWindow();
+{$ENDIF}
 
     AddProgress();