tremulous: fix the bucket system for QVMs.

GrangerHub · Mar 31, 2020 · 798ad46 · 798ad46
1 parent 89ea9ea
commit 798ad46
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/default-assets b/default-assets
diff --git a/src/filesystem/fs_tremulous.cpp b/src/filesystem/fs_tremulous.cpp
@@ -47,8 +47,8 @@ struct core_resource_s {
 
 #define CORE_RESOURCES_1_3 \
     {0, "core_game_dll"},   /* Core dll defined by FS_CORE_GAME_DLL_NAME */ \
-    1246283756,             /* trem13/vms-gpp-v1.3.0-alpha.0.14.11.pk3 */ \
-    -1758827386             /* trem13/data-v1.3.0-alpha.0.14.11.pk3 */ \
+    -15297494,             /* trem13/vms-gpp-v1.3.0-alpha.0.14.11.pk3 */ \
+    -1117796085             /* trem13/data-v1.3.0-alpha.0.14.11.pk3 */ \
 
 #define CORE_RESOURCES_GPP \
     -1154612609,            /* gpp/vms-gpp1.pk3 */ \

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
@@ -4004,7 +4004,7 @@ void BG_Bucket_Remove_Item_From_Bucket(
 }
 
 void* BG_Bucket_Select_A_Random_Item(unsigned int bucket_handle) {
-    Q_Bucket_Select_A_Random_Item(bucket_handle);
+    return Q_Bucket_Select_A_Random_Item(bucket_handle);
 }
 
 void BG_Bucket_Select_A_Specific_Item(unsigned int bucket_handle, void* item) {

diff --git a/src/qcommon/common.cpp b/src/qcommon/common.cpp
@@ -3935,7 +3935,7 @@ void Com_Bucket_Remove_Item_From_Bucket(
 }
 
 void* Com_Bucket_Select_A_Random_Item(unsigned int bucket_handle) {
-    Q_Bucket_Select_A_Random_Item(bucket_handle);
+    return Q_Bucket_Select_A_Random_Item(bucket_handle);
 }
 
 void Com_Bucket_Select_A_Specific_Item(unsigned int bucket_handle, void* item) {

diff --git a/src/sdl/sdl_glimp.cpp b/src/sdl/sdl_glimp.cpp
@@ -156,7 +156,7 @@ static void GLimp_DetectAvailableModes(void)
 		return;
 	}
 
-	modes = (SDL_Rect*)SDL_calloc( (size_t)numSDLModes, sizeof( SDL_Rect ) );
+	modes = (SDL_Rect*)SDL_calloc( (size_t)numSDLModes + 1, sizeof( SDL_Rect ) );
 	if ( !modes )
 	{
 		ri.Error( ERR_FATAL, "Out of memory" );

diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
@@ -1943,7 +1943,7 @@ void Script_playLoopedBucket(itemDef_t *item, char **args)
         DC->setCVar(selected_list_cvar, selected_list_cvar_string);
     }
 
-    if(val) {
+    if(val[0] != '\0') {
         strcpy(play_looped_sound_path, va("%s/%s", sound_bucket_directory, val));
         DC->stopBackgroundTrack();
         DC->startBackgroundTrack(play_looped_sound_path, play_looped_sound_path);
+ −		trem13/data-v1.3.0-alpha.0.14.11.pk3
+ −		trem13/vms-1.1-v1.3.0-alpha.0.14.11.pk3
+ −		trem13/vms-gpp-v1.3.0-alpha.0.14.11.pk3