[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/ui ui.c menus.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/ui ui.c menus.c |
Date: |
10 Jan 2004 06:58:49 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/10 06:58:48
Modified files:
src/ui : ui.c menus.c
Log message:
Clean up
Patches:
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.602 stratagus/src/ui/menus.c:1.603
--- stratagus/src/ui/menus.c:1.602 Sat Jan 10 06:55:28 2004
+++ stratagus/src/ui/menus.c Sat Jan 10 06:58:47 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.602 2004/01/09 19:55:28 jsalmon3 Exp $
+// $Id: menus.c,v 1.603 2004/01/09 19:58:47 jsalmon3 Exp $
//@{
@@ -5149,9 +5149,9 @@
#ifdef USE_SDL_SURFACE
MenusSetBackground();
#else
- VideoLockScreen();
+ VideoLockScreen();
MenusSetBackground();
- VideoUnlockScreen();
+ VideoUnlockScreen();
#endif
return;
}
@@ -7134,9 +7134,9 @@
}
/**
-** Multiplayer server menu init callback
+** Multiplayer server menu init callback
**
-** Mohydine: Right now, because I find it simpler, the client is sending
+** Mohydine: Right now, because I find it simpler, the client is sending
** n commands, one for each online game.
** TODO: well, redo this :)
*/
@@ -7320,7 +7320,7 @@
EndMenu();
}
}
-
+
/**
** Action to add a game server on the meta-server.
*/
@@ -7329,7 +7329,7 @@
// send message to meta server. meta server will detect IP address.
// Meta-server will return "BUSY" if the list of online games is busy.
- SendMetaCommand("AddGame", "%s\n%d\n%s\n%s\n%s\n%s\n",
+ SendMetaCommand("AddGame", "%s\n%d\n%s\n%s\n%s\n%s\n",
"IP", NetworkPort, "Name", "Map", "Players", "Free");
// FIXME: Get Reply from Queue
@@ -7340,10 +7340,10 @@
*/
local void ChangeGameServer(void)
{
- int i;
- int freespots;
- int players;
-
+ int i;
+ int freespots;
+ int players;
+
// send message to meta server. meta server will detect IP address.
// Meta-server will return "ERR" if the list of online games is busy.
@@ -7357,19 +7357,19 @@
++freespots;
}
}
- SendMetaCommand("ChangeGame", "%s\n%s\n%d\n%d\n",
+ SendMetaCommand("ChangeGame", "%s\n%s\n%d\n%d\n",
"Name", ScenSelectFileName, players, freespots - 1);
// FIXME: Get Reply from Queue
}
-/**
-** FIXME: docu
+/**
+** FIXME: docu
*/
local int MetaServerConnectError(void)
{
- Invalidate();
- NetErrorMenu("Cannot Connect to Meta-Server");
+ Invalidate();
+ NetErrorMenu("Cannot Connect to Meta-Server");
#ifdef USE_SDL_SURFACE
MenusSetBackground();
#else
@@ -7379,7 +7379,7 @@
#endif
return 0;
}
-
+
/**
** Close MetaServer connection
*/
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.93 stratagus/src/ui/ui.c:1.94
--- stratagus/src/ui/ui.c:1.93 Sat Jan 3 11:31:50 2004
+++ stratagus/src/ui/ui.c Sat Jan 10 06:58:47 2004
@@ -5,13 +5,13 @@
// /_______ /|__| |__| (____ /__| (____ /\___ /|____//____ >
// \/ \/ \//_____/ \/
// ______________________ ______________________
-// T H E W A R B E G I N S
-// Stratagus - A free fantasy real time strategy game engine
+// T H E W A R B E G I N S
+// Stratagus - A free fantasy real time strategy game engine
//
-/address@hidden ui.c - The user interface globals. */
+/address@hidden ui.c - The user interface globals. */
//
-// (c) Copyright 1999-2003 by Lutz Sammer, Andreas Arens, and
-// Jimmy Salmon
+// (c) Copyright 1999-2004 by Lutz Sammer, Andreas Arens, and
+// Jimmy Salmon
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ui.c,v 1.93 2004/01/03 00:31:50 jsalmon3 Exp $
+// $Id: ui.c,v 1.94 2004/01/09 19:58:47 jsalmon3 Exp $
//@{
@@ -159,12 +159,11 @@
TheUI.CompletedBarColorRGB.r,
TheUI.CompletedBarColorRGB.g,
TheUI.CompletedBarColorRGB.b);
- TheUI.ViewportCursorColor = ColorWhite;
#else
TheUI.CompletedBarColor = VideoMapRGB(TheUI.CompletedBarColorRGB.D24.a,
TheUI.CompletedBarColorRGB.D24.b,
TheUI.CompletedBarColorRGB.D24.c);
- TheUI.ViewportCursorColor = ColorWhite;
#endif
+ TheUI.ViewportCursorColor = ColorWhite;
}
/**
@@ -639,6 +638,7 @@
int i;
const Viewport* vp;
+ // FIXME: don't save the number
CLprintf(file, "DefineViewports(\"mode\", %d", ui->ViewportMode);
for (i = 0; i < ui->NumViewports; ++i) {
vp = &ui->Viewports[i];
@@ -658,7 +658,7 @@
int i;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.93 2004/01/03 00:31:50
jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.94 2004/01/09 19:58:47
jsalmon3 Exp $\n\n");
// Contrast, Brightness, Saturation
CLprintf(file, "(set-contrast! %d)\n", TheUI.Contrast);
@@ -682,7 +682,7 @@
}
/**
-** Clean up a user interface.
+** Clean up a user interface.
*/
global void CleanUI(UI* ui)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src/ui ui.c menus.c,
address@hidden <=