QVM based MP3 player :)

1 files changed, 41 insertions, 32 deletions

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index c66ce5fe..0e398258 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -36,56 +36,56 @@
 // by the server in the server stored userinfos, or stashed in a cvar.
 
 
-#define POWERUP_BLINKS    5
+#define POWERUP_BLINKS      5
 
 #define POWERUP_BLINK_TIME  1000
-#define FADE_TIME     200
-#define PULSE_TIME      200
+#define FADE_TIME           200
+#define PULSE_TIME          200
 #define DAMAGE_DEFLECT_TIME 100
 #define DAMAGE_RETURN_TIME  400
-#define DAMAGE_TIME     500
-#define LAND_DEFLECT_TIME 150
-#define LAND_RETURN_TIME  300
-#define STEP_TIME     200
-#define DUCK_TIME     100
-#define PAIN_TWITCH_TIME  200
+#define DAMAGE_TIME         500
+#define LAND_DEFLECT_TIME   150
+#define LAND_RETURN_TIME    300
+#define STEP_TIME           200
+#define DUCK_TIME           100
+#define PAIN_TWITCH_TIME    200
 #define WEAPON_SELECT_TIME  1400
-#define ITEM_SCALEUP_TIME 1000
-#define ZOOM_TIME     150
-#define ITEM_BLOB_TIME    200
-#define MUZZLE_FLASH_TIME 20
-#define SINK_TIME     1000    // time for fragments to sink into ground before going away
+#define ITEM_SCALEUP_TIME   1000
+#define ZOOM_TIME           150
+#define ITEM_BLOB_TIME      200
+#define MUZZLE_FLASH_TIME   20
+#define SINK_TIME           1000    // time for fragments to sink into ground before going away
 #define ATTACKER_HEAD_TIME  10000
-#define REWARD_TIME     3000
+#define REWARD_TIME         3000
 
-#define PULSE_SCALE     1.5     // amount to scale up the icons when activating
+#define PULSE_SCALE         1.5     // amount to scale up the icons when activating
 
-#define MAX_STEP_CHANGE   32
+#define MAX_STEP_CHANGE     32
 
-#define MAX_VERTS_ON_POLY 10
-#define MAX_MARK_POLYS    256
+#define MAX_VERTS_ON_POLY   10
+#define MAX_MARK_POLYS      256
 
-#define STAT_MINUS      10  // num frame for '-' stats digit
+#define STAT_MINUS          10  // num frame for '-' stats digit
 
-#define ICON_SIZE     48
-#define CHAR_WIDTH      32
-#define CHAR_HEIGHT     48
-#define TEXT_ICON_SPACE   4
+#define ICON_SIZE           48
+#define CHAR_WIDTH          32
+#define CHAR_HEIGHT         48
+#define TEXT_ICON_SPACE     4
 
-#define TEAMCHAT_WIDTH    80
-#define TEAMCHAT_HEIGHT   8
+#define TEAMCHAT_WIDTH      80
+#define TEAMCHAT_HEIGHT     8
 
 // very large characters
-#define GIANT_WIDTH     32
-#define GIANT_HEIGHT    48
+#define GIANT_WIDTH         32
+#define GIANT_HEIGHT        48
 
-#define NUM_CROSSHAIRS    10
+#define NUM_CROSSHAIRS      10
 
 #define TEAM_OVERLAY_MAXNAME_WIDTH  12
 #define TEAM_OVERLAY_MAXLOCATION_WIDTH  16
 
-#define DEFAULT_MODEL     "sarge"
-#define DEFAULT_TEAM_MODEL    "sarge"
+#define DEFAULT_MODEL       "sarge"
+#define DEFAULT_TEAM_MODEL  "sarge"
 #define DEFAULT_TEAM_HEAD   "sarge"
 
 #define DEFAULT_REDTEAM_NAME    "Stroggs"
@@ -1168,6 +1168,7 @@ extern  vmCvar_t    cg_bigFont;
 extern  vmCvar_t    cg_noTaunt;
 extern  vmCvar_t    cg_creepRes;
 extern  vmCvar_t    cg_drawSurfNormal;
+extern  vmCvar_t    cg_debugAlloc;
 
 //
 // cg_main.c
@@ -1457,9 +1458,17 @@ void CG_TransitionPlayerState( playerState_t *ps, playerState_t *ops );
 void CG_CheckChangedPredictableEvents( playerState_t *ps );
 
 //
-//cg_mem.c
+// cg_mem.c
 //
+void CG_InitMemory( void );
 void *CG_Alloc( int size );
+void CG_Free( void *ptr );
+void CG_DefragmentMemory( void );
+
+//
+// cg_mp3decoder.c
+//
+qboolean S_decodeMP3( char *mp3File, char *wavFile );
 
 //===============================================