X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapinfo.qh;h=3eda45e76b01cd0bae373c9133c570639af3b4d5;hb=3fcea167998cc6f1c68e9e814beb148afb4393fa;hp=a3bb4efbfede216fc0a9ad997bda46a6479805c6;hpb=120e26841a6db8566b8b55f6a0625ff5bcf5d3ad;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh index a3bb4efbf..3eda45e76 100644 --- a/qcsrc/common/mapinfo.qh +++ b/qcsrc/common/mapinfo.qh @@ -1,9 +1,9 @@ -var float MAPINFO_TYPE_ALL = 0; +float MAPINFO_TYPE_ALL; entity MapInfo_Type_first; entity MapInfo_Type_last; .entity enemy; // internal next pointer -.float weapons; // game type ID +.float items; // game type ID .string netname; // game type name as in cvar (with g_ prefix) .string mdl; // game type short name .string message; // human readable name @@ -17,7 +17,7 @@ entity MapInfo_Type_last; MAPINFO_TYPE_##NAME = MAPINFO_TYPE_ALL + 1; \ MAPINFO_TYPE_ALL |= MAPINFO_TYPE_##NAME; \ MapInfo_Type##g_name = spawn(); \ - MapInfo_Type##g_name.weapons = MAPINFO_TYPE_##NAME; \ + MapInfo_Type##g_name.items = MAPINFO_TYPE_##NAME; \ MapInfo_Type##g_name.netname = #g_name; \ MapInfo_Type##g_name.mdl = #sname; \ MapInfo_Type##g_name.message = hname; \ @@ -39,12 +39,12 @@ REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,"timelimit=20 pointlimit=30 REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,"timelimit=20 lives=9 leadlimit=0") #define g_lms IS_GAMETYPE(LMS) +REGISTER_GAMETYPE(_("Tower Defense"),td,g_td,TD,"timelimit=0 pointlimit=10 leadlimit=0") +#define g_td IS_GAMETYPE(TD) + REGISTER_GAMETYPE(_("Arena"),arena,g_arena,ARENA,"timelimit=20 pointlimit=10 leadlimit=0") #define g_arena IS_GAMETYPE(ARENA) -REGISTER_GAMETYPE(_("Runematch"),rune,g_runematch,RUNEMATCH,"timelimit=20 pointlimit=200 leadlimit=0") -#define g_runematch IS_GAMETYPE(RUNEMATCH) - REGISTER_GAMETYPE(_("Race"),rc,g_race,RACE,"timelimit=20 qualifying_timelimit=5 laplimit=7 teamlaplimit=15 leadlimit=0") #define g_race IS_GAMETYPE(RACE)