Merge branch 'upstream'

Author: zturtleman

.github/FUNDING.yml

@@ -2,7 +2,7 @@
 
 patreon: nuclearmonster
 open_collective: # Replace with a single Open Collective username
-ko_fi: jackslater
+ko_fi: mrnuclearmonster
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 jobs:
   linux:
     name: Linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install Dependencies
@@ -21,7 +21,7 @@ jobs:
         path: build/*.zip
   windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     - uses: actions/checkout@v4
     - name: Compile
@@ -36,7 +36,7 @@ jobs:
         path: build/*.zip
   macos:
     name: macOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
     - name: Compile

README-ioq3.md

@@ -562,8 +562,7 @@ directory, this restriction is lifted.
 
 # Contributing
 
-Please send all patches to bugzilla (https://bugzilla.icculus.org), or as a GitHub pull request and
-submit your patch there.
+Please submit patches through GitHub pull requests.
 
 The focus for ioq3 is to develop a stable base suitable for further development
 and provide players with the same Quake 3 experience they've had for years.

README.md

@@ -31,6 +31,6 @@ Lilium Arena is licensed under [the GNU GPLv2](COPYING.txt) (or at your option,
 
 ## Contributing
 
-Please submit all patches as a GitHub pull request.
+Please submit patches through GitHub pull requests.
 
 

code/botlib/be_aas_file.c

@@ -300,7 +300,7 @@ char *AAS_LoadAASLump(fileHandle_t fp, int offset, int length, int *lastoffset,
 	if (offset != *lastoffset)
 	{
 		botimport.Print(PRT_WARNING, "AAS file not sequentially read\n");
-		if (botimport.FS_Seek(fp, offset, FS_SEEK_SET))
+		if (botimport.FS_Seek(fp, offset, FS_SEEK_SET) < 0)
 		{
 			AAS_Error("can't seek to aas lump\n");
 			AAS_DumpAASData();

code/botlib/be_ai_char.c

@@ -222,7 +222,7 @@ bot_character_t *BotLoadCharacterFromFile(char *charfile, int skill)
 	source = LoadSourceFile(charfile);
 	if (!source)
 	{
-		botimport.Print(PRT_ERROR, "counldn't load %s\n", charfile);
+		botimport.Print(PRT_ERROR, "couldn't load %s\n", charfile);
 		return NULL;
 	} //end if
 	ch = (bot_character_t *) GetClearedMemory(sizeof(bot_character_t) +

code/botlib/be_ai_chat.c

@@ -629,7 +629,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
 		source = LoadSourceFile(filename);
 		if (!source)
 		{
-			botimport.Print(PRT_ERROR, "counldn't load %s\n", filename);
+			botimport.Print(PRT_ERROR, "couldn't load %s\n", filename);
 			return NULL;
 		} //end if
 		//
@@ -984,7 +984,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
 		source = LoadSourceFile(filename);
 		if (!source)
 		{
-			botimport.Print(PRT_ERROR, "counldn't load %s\n", filename);
+			botimport.Print(PRT_ERROR, "couldn't load %s\n", filename);
 			return NULL;
 		} //end if
 		//
@@ -1286,7 +1286,7 @@ bot_matchtemplate_t *BotLoadMatchTemplates(char *matchfile)
 	source = LoadSourceFile(matchfile);
 	if (!source)
 	{
-		botimport.Print(PRT_ERROR, "counldn't load %s\n", matchfile);
+		botimport.Print(PRT_ERROR, "couldn't load %s\n", matchfile);
 		return NULL;
 	} //end if
 	//
@@ -1858,7 +1858,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename)
 	source = LoadSourceFile(filename);
 	if (!source)
 	{
-		botimport.Print(PRT_ERROR, "counldn't load %s\n", filename);
+		botimport.Print(PRT_ERROR, "couldn't load %s\n", filename);
 		return NULL;
 	} //end if
 	//
@@ -2057,7 +2057,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
 		source = LoadSourceFile(chatfile);
 		if (!source)
 		{
-			botimport.Print(PRT_ERROR, "counldn't load %s\n", chatfile);
+			botimport.Print(PRT_ERROR, "couldn't load %s\n", chatfile);
 			return NULL;
 		} //end if
 		//chat structure

code/botlib/be_ai_goal.c

@@ -288,7 +288,7 @@ itemconfig_t *LoadItemConfig(char *filename)
 	PC_SetBaseFolder(BOTFILESBASEFOLDER);
 	source = LoadSourceFile( path );
 	if( !source ) {
-		botimport.Print( PRT_ERROR, "counldn't load %s\n", path );
+		botimport.Print( PRT_ERROR, "couldn't load %s\n", path );
 		return NULL;
 	} //end if
 	//initialize item config

code/botlib/be_ai_weap.c

@@ -224,7 +224,7 @@ weaponconfig_t *LoadWeaponConfig(char *filename)
 	source = LoadSourceFile(path);
 	if (!source)
 	{
-		botimport.Print(PRT_ERROR, "counldn't load %s\n", path);
+		botimport.Print(PRT_ERROR, "couldn't load %s\n", path);
 		return NULL;
 	} //end if
 	//initialize weapon config

code/botlib/be_ai_weight.c

@@ -327,7 +327,7 @@ weightconfig_t *ReadWeightConfig(char *filename)
 	source = LoadSourceFile(filename);
 	if (!source)
 	{
-		botimport.Print(PRT_ERROR, "counldn't load %s\n", filename);
+		botimport.Print(PRT_ERROR, "couldn't load %s\n", filename);
 		return NULL;
 	} //end if
 	//