nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-25 21:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #34 from ScatterBox/main

Browse source 
Restore svc_songegg and svc_maxammo in QC
This commit is contained in:
Ian 2023-01-24 16:35:43 -05:00 committed by GitHub
commit e1c39f2bb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/server/defs/quakespasm.qc
View file

@ -270,8 +270,8 @@ string (string s)
float(string s) tokenize = #441; float(string s) tokenize = #441;
string(float num) argv = #442; string(float num) argv = #442;
// 2001-11-15 DarkPlaces general builtin functions by Lord Havoc end // 2001-11-15 DarkPlaces general builtin functions by Lord Havoc end
//void (string trackname) songegg = #500; void (string trackname) songegg = #500;
//void () nzp_maxammo = #501; void () nzp_maxammo = #501;
// //
// constants // constants
@ -395,12 +395,13 @@ string(float num)
#define SVC_CUTSCENE 34 // 1998-08-08 Complete SVC list by Zhenga #define SVC_CUTSCENE 34 // 1998-08-08 Complete SVC list by Zhenga
#define SVC_WEAPONFIRE 35 #define SVC_WEAPONFIRE 35
#define SVC_HITMARK 36 #define SVC_HITMARK 36
#define SVC_USEPRINT 38
#define SVC_MUZZLEFLASH 39
#define SVC_SONGEGG 45 // 45
#define SVC_MAXAMMO 46 // 46
#define SVC_LIMBUPDATE 51 // naievil -- keep me #define SVC_LIMBUPDATE 51 // naievil -- keep me
#define SVC_BSPDECAL 50 // naievil -- keep me #define SVC_BSPDECAL 50 // naievil -- keep me
#define SVC_ACHIEVEMENT 52 #define SVC_ACHIEVEMENT 52
#define SVC_HITMARK 36
#define SVC_USEPRINT 38
#define SVC_MUZZLEFLASH 39
#define TE_SPIKE 0 #define TE_SPIKE 0
#define TE_SUPERSPIKE 1 #define TE_SUPERSPIKE 1

3
source/server/entities/powerups.qc
View file

@ -421,6 +421,9 @@ void() PU_MaxAmmo =
#ifdef HANDHELD #ifdef HANDHELD
nzp_maxammo(); nzp_maxammo();
#endif #endif
#ifdef QUAKESPASM
nzp_maxammo();
#endif
tempe = find(tempe, classname, "player"); tempe = find(tempe, classname, "player");
} }
}; };