[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src editor/editloop.c game/loadgame.c...
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src editor/editloop.c game/loadgame.c... |
Date: |
21 Jan 2004 15:57:18 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/21 15:57:17
Modified files:
src/editor : editloop.c
src/game : loadgame.c
src/stratagus : stratagus.c
src/ui : menus.c
Log message:
Moved CleanFonts to CleanModules
Patches:
Index: stratagus/src/editor/editloop.c
diff -u stratagus/src/editor/editloop.c:1.156
stratagus/src/editor/editloop.c:1.157
--- stratagus/src/editor/editloop.c:1.156 Sat Jan 17 02:17:22 2004
+++ stratagus/src/editor/editloop.c Wed Jan 21 15:57:13 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: editloop.c,v 1.156 2004/01/16 15:17:22 wizzard Exp $
+// $Id: editloop.c,v 1.157 2004/01/21 04:57:13 jsalmon3 Exp $
//@{
@@ -2077,7 +2077,6 @@
// Restore all for menu
//
CleanModules();
- CleanFonts();
LoadCcl(); // Reload the main config file
Index: stratagus/src/game/loadgame.c
diff -u stratagus/src/game/loadgame.c:1.81 stratagus/src/game/loadgame.c:1.82
--- stratagus/src/game/loadgame.c:1.81 Wed Jan 21 05:41:58 2004
+++ stratagus/src/game/loadgame.c Wed Jan 21 15:57:14 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: loadgame.c,v 1.81 2004/01/20 18:41:58 nobody_ Exp $
+// $Id: loadgame.c,v 1.82 2004/01/21 04:57:14 jsalmon3 Exp $
//@{
@@ -85,6 +85,7 @@
CleanMenus();
#endif
CleanUserInterface();
+ CleanFonts();
CleanCampaign();
CleanTriggers();
CleanAi();
@@ -219,6 +220,9 @@
CommandLogDisabled = 1;
LoadCcl();
+
+ SetDefaultTextColors(FontYellow, FontWhite);
+ LoadFonts();
CclGarbageCollect(0);
InitVisionTable();
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.253
stratagus/src/stratagus/stratagus.c:1.254
--- stratagus/src/stratagus/stratagus.c:1.253 Wed Jan 21 05:42:02 2004
+++ stratagus/src/stratagus/stratagus.c Wed Jan 21 15:57:15 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.c,v 1.253 2004/01/20 18:42:02 nobody_ Exp $
+// $Id: stratagus.c,v 1.254 2004/01/21 04:57:15 jsalmon3 Exp $
//@{
@@ -834,7 +834,6 @@
UnitCacheStatistic();
CclUnits(Lua);
CleanModules();
- CleanFonts();
lua_close(Lua);
#endif
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.609 stratagus/src/ui/menus.c:1.610
--- stratagus/src/ui/menus.c:1.609 Sat Jan 17 14:09:10 2004
+++ stratagus/src/ui/menus.c Wed Jan 21 15:57:16 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.609 2004/01/17 03:09:10 wizzard Exp $
+// $Id: menus.c,v 1.610 2004/01/21 04:57:16 jsalmon3 Exp $
//@{
@@ -1765,7 +1765,6 @@
DestroyCursorBackground();
SetClipping(0,0,VideoWidth - 1,VideoHeight - 1);
CleanModules();
- CleanFonts();
LoadCcl();
PreMenuSetup();
GameCursor = TheUI.Point.Cursor;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src editor/editloop.c game/loadgame.c...,
address@hidden <=