Restore new loading screens

README.md

@@ -4,7 +4,7 @@
 This repository contains the PSP engine for NZ:P, based on dQuakePlus and containing optimizations from the NZ:P Team, adQuake, and Xash3D-PSP, as well as NZ:P-specific feature implementation. It has also been modified to build on the latest versions of the [PSPSDK](https://github.com/pspdev/pspsdk).
 
 ## Building (Advanced)
-Building requires a full install of [psptoolchain](https://github.com/pspdev/psptoolchain/). You can either follow the instructions on the GitHub repository or use a Docker container (we recommend [bmaupin](https://hub.docker.com/r/bmaupin/pspdev)'s)!
+Building requires a full install of [psptoolchain](https://github.com/pspdev/psptoolchain/). You can either follow the instructions on the GitHub repository or use a Docker container (we recommend [sharkwouter](https://hub.docker.com/r/sharkwouter/pspdev)'s)!
 
 With the psptoolchain installed, you now need to install `libpspmath`, which we have included in the GitHub repository:
 ```bash

source/cl_parse.c

@@ -403,6 +403,7 @@ void CL_ParseServerInfo (void)
 //
 
    loading_num_step = loading_num_step +nummodels + numsounds;
+   loading_step = 1;
 
 	//Con_Printf("Loaded Model: ");
 
@@ -412,6 +413,7 @@ void CL_ParseServerInfo (void)
 		if (cl.model_precache[i] == NULL)
 		{
 			Con_Printf("Model %s not found\n", model_precache[i]);
+			loading_cur_step++;
 			return;
 		}
 		CL_KeepaliveMessage ();
@@ -429,6 +431,8 @@ void CL_ParseServerInfo (void)
 	//cl.model_precache[nummodels] = Mod_ForName ("progs/flame0.mdl", false);
 	//cl_modelindex[mi_flame0] = nummodels++;
 
+	loading_step = 4;
+
 	S_BeginPrecaching ();
 	//Con_Printf("Loaded Sounds: ");
 	for (i=1 ; i<numsounds ; i++)

source/draw.h

@@ -43,6 +43,7 @@ void Clear_LoadingFill (void);
 byte *StringToRGB (char *s);
 
 extern float loading_cur_step;
+extern int loading_step;
 extern char loading_name[32];
 extern float loading_num_step;
 

source/host.c

@@ -826,25 +826,24 @@ void Preload (void)
 {
 	Mod_ForName ("models/player.mdl", true);
 
-	Mod_ForName ("progs/ai/zb#.mdl",true);
+	Mod_ForName("models/ai/zbod.mdl", true);
-	Mod_ForName ("progs/ai/zal(.mdl",true);
+	Mod_ForName("models/ai/zcbod.mdl", true);
-	Mod_ForName ("progs/ai/zar(.mdl",true);
+	Mod_ForName ("models/ai/zfull.mdl",true);
-	Mod_ForName ("progs/ai/zh^.mdl",true);
+	Mod_ForName ("models/ai/zcfull.mdl",true);
-	Mod_ForName ("progs/ai/zbc#.mdl",true);
+	Mod_ForName ("models/ai/zhead.mdl",true);
-	Mod_ForName ("progs/ai/zalc(.mdl",true);
+	Mod_ForName ("models/ai/zchead.mdl",true);
-	Mod_ForName ("progs/ai/zarc(.mdl",true);
+	Mod_ForName ("models/ai/zlarm.mdl",true);
-	Mod_ForName ("progs/ai/zhc^.mdl",true);
+	Mod_ForName ("models/ai/zclarm.mdl",true);
+	Mod_ForName ("models/ai/zrarm.mdl",true);
+	Mod_ForName ("models/ai/zcrarm.mdl",true);
 
-	Mod_ForName ("progs/ai/zfull.mdl",true);
+	Mod_ForName ("models/weapons/knife/v_knife.mdl", true);
-	Mod_ForName ("progs/ai/zcfull.mdl",true);
+	Mod_ForName ("models/weapons/m1911/v_colt.mdl", true);
-
+	Mod_ForName ("models/pu/instakill!.mdl", true);
-	Mod_ForName ("progs/VModels/v_knife.mdl", true);
+	Mod_ForName ("models/pu/maxammo!.mdl", true);
-	Mod_ForName ("progs/VModels/v_colt.mdl", true);
+	Mod_ForName ("models/pu/nuke!.mdl", true);
-	Mod_ForName ("progs/Misc/instakill!.mdl", true);
+	Mod_ForName ("models/pu/carpenter!.mdl", true);
-	Mod_ForName ("progs/Misc/maxammo!.mdl", true);
+	Mod_ForName ("models/pu/x2!.mdl", true);
-	Mod_ForName ("progs/Misc/nuke!.mdl", true);
-	Mod_ForName ("progs/Misc/carpenter!.mdl", true);
-	Mod_ForName ("progs/Misc/x2!.mdl", true);
 }
 /*
 ====================

source/menu.c

@@ -57,6 +57,10 @@ extern qboolean bmg_type_changed;
 extern int loadingScreen;
 extern int ShowBlslogo;
 
+extern char* loadname2;
+extern char* loadnamespec;
+extern qboolean loadscreeninit;
+
 // Backgrounds
 qpic_t *menu_bk;
 
@@ -450,6 +454,7 @@ void M_Paused_Menu_f ()
 	m_state = m_paused_menu;
 	m_entersound = true;
 	loadingScreen = 0;
+	loadscreeninit = false;
 	M_Paused_Cusor = 0;
 }
 
@@ -792,6 +797,7 @@ void M_Exit_Key (int key)
 	case 'y':
 	case K_ENTER:
 		Cbuf_AddText("disconnect\n");
+		CL_ClearState ();
 		M_Menu_Main_f();
 		break;
 
@@ -1027,7 +1033,12 @@ void M_Map_Key (int key)
 					Cbuf_AddText ("disconnect\n");
 				Cbuf_AddText ("maxplayers 1\n");
 				Cbuf_AddText (va("map %s\n", custom_maps[m_map_cursor + multiplier].map_name));
-				//loadingScreen = 1;
+				loadingScreen = 1;
+				loadname2 = custom_maps[m_map_cursor + multiplier].map_name;
+				if (custom_maps[m_map_cursor + multiplier].map_name_pretty != 0)
+					loadnamespec = custom_maps[m_map_cursor + multiplier].map_name_pretty;
+				else
+					loadnamespec = custom_maps[m_map_cursor + multiplier].map_name;
 			}
 			break;
 	}
@@ -1171,6 +1182,8 @@ void M_SinglePlayer_Key (int key)
 					Cbuf_AddText ("maxplayers 1\n");
 					Cbuf_AddText ("map ndu\n");
 					loadingScreen = 1;
+					loadname2 = "ndu";
+					loadnamespec = "Nacht der Untoten";
 					break;
 				case 1:
 					key_dest = key_game;
@@ -1178,7 +1191,9 @@ void M_SinglePlayer_Key (int key)
 						Cbuf_AddText ("disconnect\n");
 					Cbuf_AddText ("maxplayers 1\n");
 					Cbuf_AddText ("map warehouse\n");
-					loadingScreen = 2;
+					loadingScreen = 1;
+					loadname2 = "warehouse";
+					loadnamespec = "Warehouse";
 					break;
 				case 2:
 					key_dest = key_game;
@@ -1186,7 +1201,9 @@ void M_SinglePlayer_Key (int key)
 						Cbuf_AddText ("disconnect\n");
 					Cbuf_AddText ("maxplayers 1\n");
 					Cbuf_AddText ("map christmas_special\n");
-					loadingScreen = 3;
+					loadingScreen = 1;
+					loadname2 = "christmas_special";
+					loadnamespec = "Christmas Special";
 					break;
 				case 3:
 					M_Menu_Map_f ();
@@ -4857,6 +4874,21 @@ double m_serverInfoMessageTime;
 
 //==================== Map Find System By Crow_bar =============================
 
+// UGHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+// fuck windows
+char* remove_windows_newlines(char* line)
+{
+	char *p = strchr(line, '\r');
+	while (p) {
+		*p = '\0';
+		strcat(line, ++p);
+		p = strchr(p, '\r');
+	}
+
+	return line;
+}
+
+
 void Map_Finder(void)
 {
 
@@ -4938,18 +4970,18 @@ void Map_Finder(void)
 				strtok(buffer, "\n");
 				while(buffer != NULL) {
 					switch(state) {
-						case 0: strcpy(custom_maps[user_maps_num].map_name_pretty, buffer); break;
+						case 0: strcpy(custom_maps[user_maps_num].map_name_pretty, remove_windows_newlines(buffer)); break;
-						case 1: strcpy(custom_maps[user_maps_num].map_desc_1, buffer); break;
+						case 1: strcpy(custom_maps[user_maps_num].map_desc_1, remove_windows_newlines(buffer)); break;
-						case 2: strcpy(custom_maps[user_maps_num].map_desc_2, buffer); break;
+						case 2: strcpy(custom_maps[user_maps_num].map_desc_2, remove_windows_newlines(buffer)); break;
-						case 3: strcpy(custom_maps[user_maps_num].map_desc_3, buffer); break;
+						case 3: strcpy(custom_maps[user_maps_num].map_desc_3, remove_windows_newlines(buffer)); break;
-						case 4: strcpy(custom_maps[user_maps_num].map_desc_4, buffer); break;
+						case 4: strcpy(custom_maps[user_maps_num].map_desc_4, remove_windows_newlines(buffer)); break;
-						case 5: strcpy(custom_maps[user_maps_num].map_desc_5, buffer); break;
+						case 5: strcpy(custom_maps[user_maps_num].map_desc_5, remove_windows_newlines(buffer)); break;
-						case 6: strcpy(custom_maps[user_maps_num].map_desc_6, buffer); break;
+						case 6: strcpy(custom_maps[user_maps_num].map_desc_6, remove_windows_newlines(buffer)); break;
-						case 7: strcpy(custom_maps[user_maps_num].map_desc_7, buffer); break;
+						case 7: strcpy(custom_maps[user_maps_num].map_desc_7, remove_windows_newlines(buffer)); break;
-						case 8: strcpy(custom_maps[user_maps_num].map_desc_8, buffer); break;
+						case 8: strcpy(custom_maps[user_maps_num].map_desc_8, remove_windows_newlines(buffer)); break;
-						case 9: strcpy(custom_maps[user_maps_num].map_author, buffer); break;
+						case 9: strcpy(custom_maps[user_maps_num].map_author, remove_windows_newlines(buffer)); break;
-						case 10: value = 0; sscanf(buffer, "%d", &value); custom_maps[user_maps_num].map_use_thumbnail = value; break;
+						case 10: value = 0; sscanf(remove_windows_newlines(buffer), "%d", &value); custom_maps[user_maps_num].map_use_thumbnail = value; break;
-						case 11: value = 0; sscanf(buffer, "%d", &value); custom_maps[user_maps_num].map_allow_game_settings = value; break;
+						case 11: value = 0; sscanf(remove_windows_newlines(buffer), "%d", &value); custom_maps[user_maps_num].map_allow_game_settings = value; break;
 						default: break;
 					}
 					state++;

source/psp/network_infrastructure.cpp

@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #include <netdb.h>
 
-#include "gethost.hpp"
+#include <gethost.hpp>
 
 #include <pspsdk.h>
 

source/psp/video_hardware_QMB.cpp

@@ -442,7 +442,7 @@ void QMB_InitParticles (void)
 	
 	if (!(particleimage = loadtextureimage("textures/particles/particlefont", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 
@@ -470,7 +470,7 @@ void QMB_InitParticles (void)
 	// load the rest of the images
 	if(!(particleimage = loadtextureimage("textures/particles/q3particlefont", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	
@@ -495,7 +495,7 @@ void QMB_InitParticles (void)
 
 	if (!(particleimage = loadtextureimage("textures/particles/flame", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	
@@ -510,7 +510,7 @@ void QMB_InitParticles (void)
 
 	if (!(particleimage = loadtextureimage("textures/particles/inferno", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
     max_s = max_t = 256.0;
@@ -521,7 +521,7 @@ void QMB_InitParticles (void)
 
 	if (!(particleimage = loadtextureimage("textures/particles/zing1", 0, 0, qfalse, GU_LINEAR)))
 	{
-        Clear_LoadingFill ();
+        //Clear_LoadingFill ();
 		return;
 	}
 
@@ -534,7 +534,7 @@ void QMB_InitParticles (void)
 	
 	if (!(particleimage = loadtextureimage("textures/mzfl/mzfl0", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	//max_s = max_t = 256.0;
@@ -545,7 +545,7 @@ void QMB_InitParticles (void)
 
 	if (!(particleimage = loadtextureimage("textures/mzfl/mzfl1", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	//max_s = max_t = 256.0;
@@ -555,7 +555,7 @@ void QMB_InitParticles (void)
 	SCR_UpdateScreen ();
 	if (!(particleimage = loadtextureimage("textures/mzfl/mzfl2", 0, 0, qfalse, GU_LINEAR)))
 	{
-        Clear_LoadingFill ();
+        //Clear_LoadingFill ();
 		return;
 	}
 	//max_s = max_t = 256.0;
@@ -566,7 +566,7 @@ void QMB_InitParticles (void)
 
 	if (!(particleimage = loadtextureimage("textures/mzfl/muzzleflash8", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	//max_s = max_t = 256.0;
@@ -578,7 +578,7 @@ void QMB_InitParticles (void)
 	max_s = max_t = 64.0;
 	if (!(particleimage = loadtextureimage("textures/particles/bloodcloud", 0, 0, qfalse, GU_LINEAR)))
 	{
-        Clear_LoadingFill ();
+        //Clear_LoadingFill ();
 		return;
 	}
 	//max_s = max_t = 256.0;
@@ -613,7 +613,7 @@ void QMB_InitParticles (void)
 */
 	if (!(particleimage = loadtextureimage("textures/particles/fly", 0, 0, qfalse, GU_LINEAR)))
 	{
-		Clear_LoadingFill ();
+		//Clear_LoadingFill ();
 		return;
 	}
 	max_s = max_t = 256.0;

source/psp/video_hardware_draw.cpp

@@ -60,6 +60,8 @@ bool 	 	tex_scale_down = true;
 float 	loading_cur_step;
 char	loading_name[32];
 float 	loading_num_step;
+int 	loading_step;
+float 	loading_cur_step_bk;
 
 #define CLUT4
 
@@ -1024,29 +1026,46 @@ void Draw_LoadingFill(void)
 	int size       	= 8;
 	int max_step   	= 350;
     int x          	= (vid.width  / 2) - (max_step / 2);
-    int y          	= vid.height - (size/ 2) - 10;
+    int y          	= vid.height - (size/ 2) - 25;
 	int l;
 	char str[64];
+	char* text;
 
 
 	if(loading_cur_step > loading_num_step)
 	      loading_cur_step = loading_num_step;
 
+	if (loading_cur_step < loading_cur_step_bk)
+		loading_cur_step = loading_cur_step_bk;
+
+	if (loading_cur_step == loading_num_step && loading_cur_step_bk != loading_num_step)
+		loading_cur_step = loading_cur_step_bk;
+
     float loadsize = loading_cur_step * (max_step / loading_num_step);
-	Draw_FillByColor (x - 2, y - 2, max_step + 4, size + 4, GU_RGBA(255, 255, 255, 200));
+	Draw_FillByColor (x - 2, y - 2, max_step + 4, size + 4, GU_RGBA(69, 69, 69, 255));
 	Draw_FillByColor (x, y, loadsize, size, GU_RGBA(0, 0, 0, 200));
 
-	strcpy (str, "Loading: ");
+	switch(loading_step) {
-	strcat (str, loading_name);
+		case 1: text = "Loading Models.."; break;
-	l = strlen (str);
+		case 2: text = "Loading World.."; break;
-	Draw_String((vid.width - l*8)/2, y, str);
+		case 3: text = "Running Test Frame.."; break;
+		case 4: text = "Loading Sounds.."; break;
+		default: text = "Initializing.."; break;
+	}
+
+	l = strlen (text);
+	Draw_String((vid.width - l*8)/2, y, text);
+
+	loading_cur_step_bk = loading_cur_step;
 }
 
 void Clear_LoadingFill (void)
 {
     //it is end loading
 	loading_cur_step = 0;
+	loading_cur_step_bk = 0;
 	loading_num_step = 0;
+	loading_step = -1;
 	memset(loading_name, 0, sizeof(loading_name));
 }
 

source/psp/video_hardware_model.cpp

@@ -1675,6 +1675,8 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
 
 
     loading_num_step = loading_num_step + 16;
+	loading_step = 2;
+
 	strcpy(loading_name, "Vertexes");
 	SCR_UpdateScreen ();
 
@@ -1772,6 +1774,9 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
 	SCR_UpdateScreen ();
 
 	Mod_MakeHull0 ();
+	loading_cur_step++;
+
+	loading_step = 3;
 
 	strcpy(loading_name, "Screen");
     loading_cur_step++;

source/psp/video_hardware_screen.cpp

@@ -26,6 +26,10 @@ extern "C"
 #include "../quakedef.h"
 }
 
+#include <pspdisplay.h>
+#include <pspgu.h>
+#include <pspgum.h>
+
 /*
 
 background clear
@@ -102,15 +106,21 @@ extern "C"	cvar_t	crosshair;
 qboolean	scr_initialized;		// ready to draw
 
 qpic_t      *hitmark;
-qpic_t 		*ls_ndu;
+/*qpic_t 		*ls_ndu;
 qpic_t 		*ls_warehouse;
-qpic_t      *ls_xmas;
+qpic_t      *ls_xmas;*/
+qpic_t 		*lscreen;
 
 int			scr_fullupdate;
 
 int			loadingScreen;
 int			ShowBlslogo;
 
+qboolean 	loadscreeninit;
+
+char* 		loadname2;
+char* 		loadnamespec;
+
 int			clearconsole;
 int			clearnotify;
 
@@ -605,10 +615,6 @@ void SCR_Init (void)
 	Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
 
     hitmark 		= Draw_CachePic("gfx/hud/hit_marker");
-	//ls_wahnsinn 	= Draw_CachePic("gfx/lscreen/wahnsinn.lmp");
-	//ls_xmas 		= Draw_CachePic("gfx/lscreen/christmas_special.lmp");
-	//ls_warehouse 	= Draw_CacheImg("gfx/lscreen/warehouse");
-	//ls_ndu 			= Draw_CacheImg("gfx/lscreen/ndu");
 
 	scr_initialized = qtrue;
 }
@@ -811,18 +817,24 @@ SCR_DrawLoadScreen
 	* Derped_Crusader
 	* Aidan
 	* yasen
+	* greg
+	* Asher
+	* Bernerd
+	* Omar Alejandro
+	* TheSmashers
 */
 double loadingtimechange;
 int loadingdot;
+int loadingtextwidth;
 char *lodinglinetext;
 qpic_t *awoo;
 char *ReturnLoadingtex (void)
 {
-    int StringNum = Random_Int(48);
+    int StringNum = Random_Int(55);
     switch(StringNum)
     {
         case 1:
-            return  "The original Quake came out in 1996 (24 years ago as of 2020!)";
+			return  "Released in 1996, Quake is now over 25 years old!";
             break;
         case 2:
             return  "Use the Kar98-k to be the hero we want you to be!";
@@ -831,16 +843,16 @@ char *ReturnLoadingtex (void)
             return  "There is a huge number of modern engines based on Quake!";
             break;
         case 4:
-            return  "Development for NZ:P officially started on September 27, 2009";
+            return  "Development for NZ:P officially began on September 27, 2009";
             break;
         case 5:
-            return  "NZ:P was first released on December 25, 2010";
+            return  "NZ:P was first released on December 25, 2010!";
             break;
         case 6:
             return  "The 1.1 release of NZ:P has over 90,000 downloads!";
             break;
         case 7:
-            return  "NZ:P has been downloaded over 400,00 times!";
+            return  "NZ:P has been downloaded over 400,000 times!";
             break;
         case 8:
             return  "The original NZP was made mainly by 3 guys around the world.";
@@ -867,7 +879,7 @@ char *ReturnLoadingtex (void)
             return  "Try Retro Mode, it's in the Graphics Settings!";
             break;
         case 16:
-            return  "Tired of Nacht der Untoten? Make your own map!";
+			return  "Tired of the base maps? Make your own or try some online!";
             break;
         case 17:
             return  "Slay zombies & be grateful.";
@@ -951,10 +963,10 @@ char *ReturnLoadingtex (void)
 			return 	"Please help me find the meaning of   . Thanks.";
 			break;
 		case 44:
-			return  "Loading..."; // "ripperoni" made me think the game crashed while loading
+			return  "NZ:P Discord is ONLY for Thomas the Tank Engine Roleplay!";
 			break;
 		case 45:
-			return 	"Get rid of the 21% cooler tip, it's an MLP reference";
+			return 	"Get rid of the 21% cooler tip, it's an MLP reference.";
 			break;
 		case 46:
 			return 	"You're playing on a PSP!";
@@ -962,9 +974,31 @@ char *ReturnLoadingtex (void)
 		case 47:
 			return 	"Don't leak the beta!";
 			break;
+		case 48:
+			return  "Jugger-Nog increases your health!";
+			break;
+		case 49:
+			return  "greg was here";
+			break;
+		case 50:
+			return  "Where the hell is the Mystery Box?!";
+			break;
+		case 51:
+			return  "Zombies like getting shot.. I think.";
+			break;
+		case 52:
+			return  "pro tip: aiming helps";
+			break;
+		case 53:
+			return  "If a Nazi Zombie bites you, are you a Nazi, or a Zombie?";
+			break;
+		case 54:
+			return  "Play some Custom Maps!";
+			break;
     }
     return "wut wut";
 }
+qboolean load_screen_exists;
 void SCR_DrawLoadScreen (void)
 {
 
@@ -972,67 +1006,46 @@ void SCR_DrawLoadScreen (void)
 		return;
 	if (!con_forcedup)
 	    return;
-/*
-	static int	count;
 
-	if (host_frametime < 0.01)
+	if (loadingScreen) {
-	{
+		if (!loadscreeninit) {
-		count = 0;
+			load_screen_exists = qfalse;
-		return;
-	}
 
-	count++;
+			char* lpath;
-	if (count < 3)
+			lpath = (char*)Z_Malloc(sizeof(char)*32);
-		return;
+			strcpy(lpath, "gfx/lscreen/");
-*/
+			strcat(lpath, loadname2);
 
-	/*if(cl.worldmodel)
+			lscreen = Draw_CachePic(lpath);
-	{
+			awoo = Draw_CacheImg("gfx/menu/awoo");
-		loadingScreen = 0;
-		ShowBlslogo = 1;
-		return;
-	}*/
 
+			if (lscreen != NULL)
+				load_screen_exists = qtrue;
 
-	/*if (!ShowBlslogo)
+			loadscreeninit = qtrue;
-	{
+		}
-        pic = Draw_CachePic ("gfx/lscreen/blstrans");
-        Draw_Pic (scr_vrect.x, scr_vrect.y, pic);
-	}*/
-	/*if (loadingScreen == 1)
-		Draw_Pic (scr_vrect.x, scr_vrect.y, ls_wahnsinn);*/
-	//else if (loadingScreen == 2)
-		/*Draw_Pic (scr_vrect.x, scr_vrect.y, ls_anstieg);*//*
-	else if (loadingScreen == 3)
-	{
-		pic = Draw_CachePic ("gfx/lscreen/psp_ch");
-		Draw_Pic (scr_vrect.x, scr_vrect.y, pic);
-	}
-	else if (loadingScreen == 4)
-	{
-		pic = Draw_CachePic ("gfx/lscreen/psp_warehouse");
-		Draw_Pic (scr_vrect.x, scr_vrect.y, pic);
-	}*/
 
-	// loading screens
+		if (load_screen_exists == qtrue)
-	switch(loadingScreen) {
+			Draw_Pic(scr_vrect.x, scr_vrect.y, lscreen);
-		//case 1: Draw_Pic(scr_vrect.x, scr_vrect.y, ls_ndu); break;
+
-		//case 2: Draw_Pic(scr_vrect.x, scr_vrect.y, ls_warehouse); break;
+		Draw_FillByColor(0, 0, 480, 24, GU_RGBA(0, 0, 0, 150));
-		//case 3: Draw_Pic(scr_vrect.x, scr_vrect.y, ls_xmas); break;
+		Draw_FillByColor(0, 248, 480, 24, GU_RGBA(0, 0, 0, 150));
+
+		Draw_ColoredString(2, 4, loadnamespec, 255, 255, 0, 255, 2);
 	}
 
 	if (loadingtimechange < Sys_FloatTime ())
 	{
         lodinglinetext = ReturnLoadingtex();
+		loadingtextwidth = strlen(lodinglinetext)*8;
         loadingtimechange = Sys_FloatTime () + 5;
 	}
 
 	if (key_dest == key_game) {
-		Draw_String (0, 0, lodinglinetext);
+		Draw_ColoredString(240 - loadingtextwidth/2, 256, lodinglinetext, 255, 255, 255, 255, 1);
 
-		if (lodinglinetext == "Please help me find the meaning of   . Thanks.") {
+		if (strcmp(lodinglinetext, "Please help me find the meaning of   . Thanks.") == 0) {
-			awoo = Draw_CacheImg("gfx/menu/awoo");
+			Draw_Pic(335, 255, awoo);
-			Draw_Pic(284, 0, awoo);
 		}
 	}