From f5b22f50e8367a957b576a8e209313668a93ad19 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 12 Nov 2004 11:23:00 +0000 Subject: [PATCH] and the ruamoko side of entity parsing :) currently disabled for now (just need to uncomment the line in Entity's +load) due to lack of filtering, but as a proof of concept, it works quite well, though I'm not at all happy about the handling of world. This is an imperfect revision of history. --- ruamoko/game/GameEntity.h | 1 + ruamoko/game/Makefile.am | 2 +- ruamoko/include/entities.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruamoko/game/GameEntity.h b/ruamoko/game/GameEntity.h index 241558d98..92d1f1393 100644 --- a/ruamoko/game/GameEntity.h +++ b/ruamoko/game/GameEntity.h @@ -2,6 +2,7 @@ #define __GameEntity_h #include "Entity.h" +#include "entities.h" @extern .vector angles; @extern .float modelindex; diff --git a/ruamoko/game/Makefile.am b/ruamoko/game/Makefile.am index 20635f02c..6e80047cd 100644 --- a/ruamoko/game/Makefile.am +++ b/ruamoko/game/Makefile.am @@ -37,7 +37,7 @@ game_src= Axe.r GameEntity.r World.r tempent.r game_obj=$(addsuffix .qfo,$(basename $(game_src))) game.dat$(GZ): $(game_obj) ../lib/libr.a ../lib/libqw.a - $(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libqw.a ../lib/libr.a + $(QFCC) $(QCFLAGS) -p $(STRIP) -o game.dat $(game_obj) ../lib/libr.a ../lib/libqw.a ../lib/libr.a $(GZIP) EXTRA_DIST= $(game_src) Axe.h GameEntity.h tempent.h Weapon.h World.h diff --git a/ruamoko/include/entities.h b/ruamoko/include/entities.h index 1c064a555..8d996f025 100644 --- a/ruamoko/include/entities.h +++ b/ruamoko/include/entities.h @@ -130,6 +130,8 @@ BUILTIN (setspawnparms, #78, void, entity e); + BUILTIN (EntityParseFunction, #0, void, void (string ent_data) func); + #ifndef __RUA_INTERNAL_IMPLEMENT }; #endif // __RUA_INTERNAL_IMPLEMENT