Changeset 117:8021fffe95f1

Timestamp:

04/24/08 19:22:17 (2 years ago)

Author:

mdoison@…

Branch:

lua

Message:

* Fix a bug : a null entity must not be able call a build callback
* Fix a bug : player package crash game at startup
* Add game hooks
* Add a time() function in luagame api

Location:

src/game

Files:

• g_admin.c (modified) (1 diff)
• g_buildable.c (modified) (1 diff)
• g_client.c (modified) (3 diffs)
• g_local.h (modified) (1 diff)
• g_lua.c (modified) (1 diff)
• g_main.c (modified) (11 diffs)
• g_svcmds.c (modified) (1 diff)
• lua_game.c (modified) (5 diffs)

src/game/g_admin.c

@@ -3305 +3305 @@
   LogExit( va( "nextmap was run by %s",
     ( ent ) ? ent->client->pers.netname : "console" ) );
+
+  G_CallGameHooks("on_exit");
+
   return qtrue;
 }

src/game/g_buildable.c

@@ -3196 +3196 @@
   vec3_t    normal;
 
-  if( ! G_CallPlayerHooks("on_build", builder) )
+  if( builder && ! G_CallPlayerHooks("on_build", builder) )
     return NULL;
 

src/game/g_client.c

@@ -1352 +1352 @@
   CalculateRanks( );
   G_admin_namelog_update( client, qfalse );
+
+  if( ! G_CallGameHooks("on_player_connect") )
+    return "Game refused by server";
+
   return NULL;
 }
@@ -1419 +1423 @@
   // count current clients and rank for scoreboard
   CalculateRanks( );
+
+  G_CallGameHooks("on_player_begin");
 }
 
@@ -1827 +1833 @@
 
   CalculateRanks( );
-}
+
+  G_CallGameHooks("on_player_disconnect");
+}

src/game/g_local.h

@@ -1330 +1330 @@
 //
 int             luaopen_game(lua_State * L);
+int             G_CallGameHooks(const char *event);
 
 //

src/game/g_lua.c

@@ -141 +141 @@
         // Quake lib
         luaopen_entity(g_luaState);
+        luaopen_player(g_luaState);
+        luaopen_buildable(g_luaState);
         luaopen_game(g_luaState);
         luaopen_qmath(g_luaState);
         luaopen_vector(g_luaState);
-
-        luaopen_buildable(g_luaState);
 
         // load global scripts

src/game/g_main.c

@@ -750 +750 @@
 
   G_ResetPTRConnections( );
+
+  G_CallGameHooks("on_init");
 }
 
@@ -780 +782 @@
 
   G_Printf( "==== ShutdownGame ====\n" );
+
+  G_CallGameHooks("on_shutdown");
 
   if( level.logFile )
@@ -1173 +1177 @@
         localHTP = 0;
         localATP = 0;
+
+                G_CallGameHooks("on_sudden_death");
 
         if( g_suddenDeathMode.integer == SDMODE_SELECTIVE ) {
@@ -1359 +1365 @@
     trap_Cvar_Set( "g_alienStage", va( "%d", S2 ) );
     level.alienStage2Time = level.time;
+    G_CallGameHooks("on_stage_up");
   }
 
@@ -1368 +1375 @@
     trap_Cvar_Set( "g_alienStage", va( "%d", S3 ) );
     level.alienStage3Time = level.time;
+    G_CallGameHooks("on_stage_up");
   }
 
@@ -1377 +1385 @@
     trap_Cvar_Set( "g_humanStage", va( "%d", S2 ) );
     level.humanStage2Time = level.time;
+    G_CallGameHooks("on_stage_up");
   }
 
@@ -1386 +1395 @@
     trap_Cvar_Set( "g_humanStage", va( "%d", S3 ) );
     level.humanStage3Time = level.time;
+    G_CallGameHooks("on_stage_up");
   }
 }
@@ -2083 +2093 @@
       trap_SendServerCommand( -1, "print \"Timelimit hit\n\"" );
       trap_SetConfigstring( CS_WINNER, "Stalemate" );
+
       LogExit( "Timelimit hit." );
+
+      G_CallGameHooks("on_exit");
+
       return;
     }
@@ -2109 +2123 @@
     trap_SendServerCommand( -1, "print \"Humans win\n\"");
     trap_SetConfigstring( CS_WINNER, "Humans Win" );
+
     LogExit( "Humans win." );
+
+    G_CallGameHooks("on_exit");
   }
   else if( level.uncondAlienWin ||
@@ -2121 +2138 @@
     trap_SetConfigstring( CS_WINNER, "Aliens Win" );
     LogExit( "Aliens win." );
+
+    G_CallGameHooks("on_exit");
   }
 }
@@ -2556 +2575 @@
     trap_Cvar_Set( "g_listEntity", "0" );
   }
+
+  G_CallGameHooks("on_think");
 }
 

src/game/g_svcmds.c

@@ -724 +724 @@
     trap_SetConfigstring( CS_WINNER, "Evacuation" );
     LogExit( "Evacuation." );
+    
+    G_CallGameHooks("on_exit");
+
     return qtrue;
   }

src/game/lua_game.c

@@ -31 +31 @@
 #include "g_local.h"
 
+int G_CallGameHooks(const char *event)
+{
 #ifdef USE_LUA
+  lua_State *L = g_luaState;
+  int ret;
+
+  lua_getglobal(L, "game");
+
+  lua_pushnil(L);
+
+  ret = G_CallHooks(event);
+
+  lua_pop(L, 2);
+
+  return ret;
+#else
+  return 1;
+#endif
+}
+
+#ifdef USE_LUA
+static int game_AddHook(lua_State *L)
+{
+  lua_getglobal(L, "game");
+  G_AddHook(L, lua_tostring(L, -3));
+
+  return 0;
+}
+
+static int game_Time(lua_State * L)
+{
+        lua_pushinteger(L, level.time - level.startTime);
+
+        return 1;
+}
+
+static int game_StartTime(lua_State * L)
+{
+        lua_pushinteger(L, level.startTime);
+
+        return 1;
+}
+
 static int game_Print(lua_State * L)
 {
@@ -108 +150 @@
 }
 
-static int game_CvarInt(lua_State *L)
+static int game_CvarInteger(lua_State *L)
 {
         const char *cvar;
@@ -194 +236 @@
 
 static const luaL_reg gamelib[] = {
+        {"AddHook", game_AddHook},
         {"Print", game_Print},
         {"Cp", game_Cp},
         {"Exec", game_Exec},
-        {"CvarInt", game_CvarInt},
+        {"CvarInteger", game_CvarInteger},
         {"CvarString", game_CvarString},
         {"CvarFloat", game_CvarFloat},
         {"CvarSet", game_CvarSet},
+        {"Time", game_Time},
+        {"StartTime", game_StartTime},
         {NULL, NULL}
 };
@@ -208 +253 @@
         luaL_register(L, "game", gamelib);
 
+        lua_newtable(L);
+
+        G_CreateHooksTable(L, "on_think");
+        G_CreateHooksTable(L, "on_init");
+        G_CreateHooksTable(L, "on_exit");
+        G_CreateHooksTable(L, "on_shutdown");
+        G_CreateHooksTable(L, "on_player_connect");
+        G_CreateHooksTable(L, "on_player_disconnect");
+        G_CreateHooksTable(L, "on_player_begin");
+        G_CreateHooksTable(L, "on_stage_up");
+        G_CreateHooksTable(L, "on_sudden_death");
+
+        lua_setfield(L, -2, "hooks");
+
         lua_pushliteral(L, "_GAMEVERSION");
         lua_pushliteral(L, GAME_VERSION);
@@ -214 +273 @@
 }
 #endif
+