diff options
| author | oy <Tom_Adams@web.de> | 2011-02-13 13:06:19 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-02-13 13:06:19 +0100 |
| commit | 3c7adc6a7fe8573341474d367c164ebf34005c1f (patch) | |
| tree | afc788e6050ea7983fb342130f2355d4bcdd62ba | |
| parent | 0ec755ee741cd0f7694e5081db4c5341f6199829 (diff) | |
| download | zcatch-3c7adc6a7fe8573341474d367c164ebf34005c1f.tar.gz zcatch-3c7adc6a7fe8573341474d367c164ebf34005c1f.zip | |
fixed nethash
| -rw-r--r-- | scripts/cmd5.py | 2 | ||||
| -rw-r--r-- | src/base/system.c | 4 | ||||
| -rw-r--r-- | src/game/server/gamecontext.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/cmd5.py b/scripts/cmd5.py index cb610903..cd4ec743 100644 --- a/scripts/cmd5.py +++ b/scripts/cmd5.py @@ -31,6 +31,6 @@ for filename in sys.argv[1:]: hash = hashlib.md5(f).hexdigest().lower()[16:] # TODO: refactor hash that is equal to the 0.5 hash, remove when we # TODO: remove when we don't need it any more -if hash == "c139dc3e0152dff6": +if hash == "8755162e69711f98": hash = "b67d1f1a1eea234e" print('#define GAME_NETVERSION_HASH "%s"' % hash) diff --git a/src/base/system.c b/src/base/system.c index a8b200f0..81c43869 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -1340,12 +1340,14 @@ void gui_messagebox(const char *title, const char *message) RunStandardAlert(theItem, NULL, &itemIndex); #elif defined(CONF_FAMILY_UNIX) static char cmd[1024]; + int err; /* use xmessage which is available on nearly every X11 system */ snprintf(cmd, sizeof(cmd), "xmessage -center -title '%s' '%s'", title, message); - int err = system(cmd); + err = system(cmd); + dbg_msg("gui/msgbox", "result = %i", err); #elif defined(CONF_FAMILY_WINDOWS) MessageBox(NULL, message, diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index cffa2f9e..885f6eb3 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -1133,4 +1133,4 @@ void CGameContext::OnPostSnap() const char *CGameContext::Version() { return GAME_VERSION; } const char *CGameContext::NetVersion() { return GAME_NETVERSION; } -IGameServer *CreateGameServer() { return new CGameContext; } \ No newline at end of file +IGameServer *CreateGameServer() { return new CGameContext; } |