stratagus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Stratagus-CVS] stratagus/src include/stratagus.h stratagus/str...


From: address@hidden
Subject: [Stratagus-CVS] stratagus/src include/stratagus.h stratagus/str...
Date: 23 Jan 2004 05:47:41 +1100

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/23 05:47:40

Modified files:
        src/include    : stratagus.h 
        src/stratagus  : stratagus.c 
        src/ui         : script_ui.c 

Log message:
        Removed MenuBackgroundWithTitle

Patches:
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.44 
stratagus/src/include/stratagus.h:1.45
--- stratagus/src/include/stratagus.h:1.44      Wed Jan 21 03:44:56 2004
+++ stratagus/src/include/stratagus.h   Fri Jan 23 05:47:37 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: stratagus.h,v 1.44 2004/01/20 16:44:56 nobody_ Exp $
+//      $Id: stratagus.h,v 1.45 2004/01/22 18:47:37 jsalmon3 Exp $
 
 #ifndef __STRATAGUS_H__
 #define __STRATAGUS_H__
@@ -401,7 +401,6 @@
 extern TitleScreen** TitleScreens;          /// File for title screen
 extern char* GameName;                      /// Name of the game
 extern char* MenuBackground;                /// File for menu background
-extern char* MenuBackgroundWithTitle;       /// File for menu with title
 extern char* MenuMusic;                     /// File for menu music
 extern char* ClickMissile;                  /// Missile to show when you click
 extern char* DamageMissile;                 /// Missile to show damage caused
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.255 
stratagus/src/stratagus/stratagus.c:1.256
--- stratagus/src/stratagus/stratagus.c:1.255   Fri Jan 23 04:07:28 2004
+++ stratagus/src/stratagus/stratagus.c Fri Jan 23 05:47:38 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: stratagus.c,v 1.255 2004/01/22 17:07:28 nobody_ Exp $
+//      $Id: stratagus.c,v 1.256 2004/01/22 18:47:38 jsalmon3 Exp $
 
 //@{
 
@@ -236,7 +236,6 @@
 
 global TitleScreen** TitleScreens;          /// Title screens to show at 
startup
 global char* MenuBackground;                /// File for menu background
-global char* MenuBackgroundWithTitle;       /// File for menu with title
 global char* MenuMusic;                     /// File for menu music
 global char* StratagusLibPath;              /// Path for data directory
 global char LocalPlayerName[16];            /// Name of local player
Index: stratagus/src/ui/script_ui.c
diff -u stratagus/src/ui/script_ui.c:1.187 stratagus/src/ui/script_ui.c:1.188
--- stratagus/src/ui/script_ui.c:1.187  Sat Jan 17 02:17:34 2004
+++ stratagus/src/ui/script_ui.c        Fri Jan 23 05:47:39 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: script_ui.c,v 1.187 2004/01/16 15:17:34 wizzard Exp $
+//      $Id: script_ui.c,v 1.188 2004/01/22 18:47:39 jsalmon3 Exp $
 
 //@{
 
@@ -401,36 +401,6 @@
 }
 
 /**
-**             Default menu background with title.
-**
-**             @param background               background. (nil reports only)
-**
-**             @return                         Old menu background.
-*/
-local int CclSetMenuBackgroundWithTitle(lua_State* l)
-{
-       char* old;
-
-       old = NULL;
-       if (MenuBackgroundWithTitle) {
-               old = strdup(MenuBackgroundWithTitle);
-       }
-       if (lua_gettop(l) != 1) {
-               lua_pushstring(l, "incorrect argument");
-               lua_error(l);
-       }
-       if (MenuBackgroundWithTitle) {
-               free(MenuBackgroundWithTitle);
-               MenuBackgroundWithTitle = NULL;
-       }
-       MenuBackgroundWithTitle = strdup(LuaToString(l, 1));
-
-       lua_pushstring(l, old);
-       free(old);
-       return 1;
-}
-
-/**
 **             Default menu music.
 **
 **             @param music            menu music. (nil reports only)
@@ -4288,8 +4258,6 @@
 
        lua_register(Lua, "SetTitleScreens", CclSetTitleScreens);
        lua_register(Lua, "SetMenuBackground", CclSetMenuBackground);
-       lua_register(Lua, "SetMenuBackgroundWithTitle",
-               CclSetMenuBackgroundWithTitle);
        lua_register(Lua, "SetMenuMusic", CclSetMenuMusic);
 
        lua_register(Lua, "DisplayPicture", CclDisplayPicture);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]