[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src stratagus/stratagus.c ui/interface.c
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src stratagus/stratagus.c ui/interface.c |
Date: |
31 Jan 2004 20:51:35 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/31 20:51:35
Modified files:
src/stratagus : stratagus.c
src/ui : interface.c
Log message:
Don't crash if there is no HandleCheats function in lua.
Patches:
Index: stratagus/src/stratagus/stratagus.c
diff -u stratagus/src/stratagus/stratagus.c:1.259
stratagus/src/stratagus/stratagus.c:1.260
--- stratagus/src/stratagus/stratagus.c:1.259 Sat Jan 31 20:40:04 2004
+++ stratagus/src/stratagus/stratagus.c Sat Jan 31 20:51:34 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.c,v 1.259 2004/01/31 09:40:04 nobody_ Exp $
+// $Id: stratagus.c,v 1.260 2004/01/31 09:51:34 nobody_ Exp $
//@{
@@ -976,7 +976,7 @@
#ifdef USE_WIN32
strcpy(LocalPlayerName, "Anonymous");
#else
- if (getenv("USERNAME")) {
+ if (getenv("USER")) {
strncpy(LocalPlayerName, getenv("USERNAME"), 14);
} else {
strcpy(LocalPlayerName, "Anonymous");
Index: stratagus/src/ui/interface.c
diff -u stratagus/src/ui/interface.c:1.155 stratagus/src/ui/interface.c:1.156
--- stratagus/src/ui/interface.c:1.155 Fri Jan 23 06:21:50 2004
+++ stratagus/src/ui/interface.c Sat Jan 31 20:51:34 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: interface.c,v 1.155 2004/01/22 19:21:50 jsalmon3 Exp $
+// $Id: interface.c,v 1.156 2004/01/31 09:51:34 nobody_ Exp $
//@{
@@ -996,6 +996,10 @@
#endif
lua_pushstring(Lua, "HandleCheats");
lua_gettable(Lua, LUA_GLOBALSINDEX);
+ if (!lua_isfunction(Lua, -1)) {
+ DebugLevel0Fn("No HandleCheats function in lua.\n");
+ return 0;
+ }
lua_pushstring(Lua, input);
LuaCall(1, 0);
ret = lua_gettop(Lua);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src stratagus/stratagus.c ui/interface.c,
address@hidden <=