From 8af8e25a22349bf011dfd73659589e8f9c414149 Mon Sep 17 00:00:00 2001 From: UberGames Date: Fri, 22 Jul 2011 22:08:45 +0200 Subject: [PATCH] Debugged LUA PlaySound function. Changed version to "Beta 8.4.7 wc1", Beta 8.4.7 working copy 1. --- game/bg_public.h | 2 +- game/lua_sound.c | 2 +- qcommon/stv_version.h | 2 +- stefgame.suo | Bin 204800 -> 204800 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/bg_public.h b/game/bg_public.h index 132c38d..263c0d7 100644 --- a/game/bg_public.h +++ b/game/bg_public.h @@ -10,7 +10,7 @@ // because games can change separately from the main system version, we need a // second version that must match between game and cgame -#define RPGX_VERSION "2.2 Beta 8.4.6" +#define RPGX_VERSION "2.2 Beta 8.4.7 wc1" #define RPGX_COMPILEDATE "20/05/11" #define RPGX_COMPILEDBY "GSIO01" //const char GAME_VERSION[] = strcat("RPG-X v",RPGX_VERSION); diff --git a/game/lua_sound.c b/game/lua_sound.c index 1f231ce..fe47e16 100644 --- a/game/lua_sound.c +++ b/game/lua_sound.c @@ -11,7 +11,7 @@ static int Sound_PlaySound(lua_State *L) { lent_t *l; l = Lua_GetEntity(L,1); - if(!l || l->e) return 0; + if(!l || !l->e) return 0; sound = (char*)luaL_checkstring(L,2); if(!sound[0]) return 0; diff --git a/qcommon/stv_version.h b/qcommon/stv_version.h index 3068a60..d2ea2c1 100644 --- a/qcommon/stv_version.h +++ b/qcommon/stv_version.h @@ -1,5 +1,5 @@ // Current version of holomatch game -#define Q3_VERSION "RPG-X v2.2 Beta 8.4.6" +#define Q3_VERSION "RPG-X v2.2 Beta 8.4.7 wc1" // end diff --git a/stefgame.suo b/stefgame.suo index b8d97cadce2aee453a37ec01414a132fce9300d5..2d87e0af752de503b3fa934922510bac7bb9811a 100644 GIT binary patch delta 3162 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