Source release of Wolfenstein 3D Classic Platinum for iOS, 2.1

wolf3d/README.txt

@@ -0,0 +1,22 @@
+WOLF3D iOS v2.1 GPL source release
+===============================================
+
+This file contains the following sections:
+
+GENERAL NOTES
+LICENSE
+
+GENERAL NOTES
+=============
+
+WOLF3D iOS v2.1 is a free release, and can be downloaded from
+http://idsoftware.com/idstuff/wolf3d/wolf3d_ios_v21_src.zip
+
+This source release does not contain any game data, the game data remains subject to the original EULA and applicable law.
+
+
+LICENSE
+=======
+
+See COPYING.txt for the GNU GENERAL PUBLIC LICENSE.  If COPYING.txt does not accompany, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+

wolf3d/code/env/fileio.c

@@ -109,12 +109,17 @@ PUBLIC W32 FS_FileSeek( filehandle_t *fhandle, SW32 offset, W32 origin )
 				return 1;
 			}
 
+			/* Commenting this out to avoid a warning - note that this is probably not what was
+			   intended!
+			   
 			// offset is negative 
 			if( (fhandle->filesize + offset) < 0  )
 			{
 				return 1;
 			}
 
+			*/
+
 			// offset is negative 
 			fhandle->ptrCurrent = fhandle->ptrEnd + offset;
 			break;
@@ -223,15 +228,14 @@ PUBLIC filehandle_t *FS_OpenFile( const char *filename, W32 FlagsAndAttributes )
 	// high performance file mapping path, avoiding stdio
 	fd = open( netpath, O_RDONLY );
 	if ( fd == -1 ) {
-//		return NULL; 
 		//if it couldn't be found in that path then check again in the document directory
 		//gsh
 		//pathBase = FS_ForceGamedir(); 
 		extern char iphoneDocDirectory[1024];
 		pathBase = iphoneDocDirectory;
 		my_snprintf( netpath, sizeof( netpath ), "%s/%s", pathBase, filename );
 		fd = open( netpath, O_RDONLY );
-		if ( fd == -1 ) {  //okay, couldn't find it there either... return null
+		if ( fd == -1 ) {  
 			return NULL;
 		}
 	}

wolf3d/code/env/files.c

@@ -172,7 +172,16 @@ PRIVATE char **FS_ListFiles( char *findname, int *numfiles, unsigned musthave, u
 */
 PUBLIC void FS_InitFilesystem( void )
 {
-	char *p;
-	p = getenv("CWD");
-	sprintf( fs_gamedir, "%s/base", p );
+#define BASE_DIRECTORY "/base"
+
+	int length = SysIPhoneGetPathToMainBundleLength();
+
+	// Make sure the path will fit.
+	int fullPathLength = length + strlen( BASE_DIRECTORY ) + 1;
+
+	assert( fullPathLength < MAX_OSPATH );
+
+	SysIPhoneGetPathToMainBundle( fs_gamedir, length + 1 );
+
+	strcpy( fs_gamedir + length, BASE_DIRECTORY );
 }

wolf3d/code/env/filesystem.h

@@ -39,6 +39,8 @@
 #ifndef __FILESYSTEM_H__
 #define __FILESYSTEM_H__
 
+#include "arch.h"
+
 #define	MAX_GAMEPATH	256	// max length of a game pathname
 #define	MAX_OSPATH		256	// max length of a filesystem pathname
 

wolf3d/code/env/openal_main.c

@@ -76,12 +76,16 @@ W16 numSoundDevices, numDefaultSoundDevice;
 PRIVATE void Sound_Device_getDeviceList( void )
 {
 	char deviceName[ 256 ];
-
+	ALboolean isExtensionPresent = AL_FALSE;
+
 	my_strlcpy( deviceName, s_device->string, sizeof( deviceName ) );
-	if( pfalcIsExtensionPresent( NULL, (ALubyte*)"ALC_ENUMERATION_EXT") == AL_TRUE ) 
+	isExtensionPresent = pfalcIsExtensionPresent( NULL, (ALubyte*)"ALC_ENUMERATION_EXT");
+	ALC_CheckErrors();
+	if( isExtensionPresent == AL_TRUE ) 
 	{	
 		// try out enumeration extension
 		deviceList = (char *)pfalcGetString( NULL, ALC_DEVICE_SPECIFIER );
+		ALC_CheckErrors();
 		for( numSoundDevices = 0 ; numSoundDevices < 12 ; ++numSoundDevices ) 
 		{
 			sound_devices[ numSoundDevices ] = NULL;
@@ -200,12 +204,14 @@ PUBLIC _boolean Sound_Device_Setup( void )
 	if( Context )
 	{
 		pfalcDestroyContext( Context );
+		ALC_CheckErrors();
 		Context = NULL;
 	}
 
 	if( Device )
 	{
 		pfalcCloseDevice( Device );
+		ALC_CheckErrors();
 		Device = NULL;
 	}
 
@@ -230,14 +236,17 @@ PUBLIC void Sound_Device_Shutdown( void )
 	if( Context )
 	{
 		pfalcMakeContextCurrent( NULL );
+		ALC_CheckErrors();
 		pfalcDestroyContext( Context );
+		ALC_CheckErrors();
 
 		Context = NULL;
 	}
 
 	if( Device )
 	{
 		pfalcCloseDevice( Device );
+		ALC_CheckErrors();
 
 		Device = NULL;
 	}

wolf3d/code/env/opengl_draw.c

@@ -93,20 +93,20 @@ PUBLIC void R_Draw_Character( int x, int y, int num, font_t *myfont )
 	R_Bind( myfont->texfont->texnum );
 
 
-	pfglBegin( GL_QUADS );
+	pfglBegin( GL_TRIANGLE_STRIP );
 
 
 	pfglTexCoord2f( fcol, frow );							
 	pfglVertex2i( x, y );
 
+	pfglTexCoord2f( fcol, frow+myfont->hFrac );
+	pfglVertex2i( x, (y+sh*scale) );
+
 	pfglTexCoord2f( fcol+myfont->wFrac, frow );					
 	pfglVertex2i( x+myfont->nMaxWidth*scale, y );
 
 	pfglTexCoord2f( fcol+myfont->wFrac, frow+myfont->hFrac );	
 	pfglVertex2i( x+myfont->nMaxWidth*scale, (y+sh*scale) );
-
-	pfglTexCoord2f( fcol, frow+myfont->hFrac );
-	pfglVertex2i( x, (y+sh*scale) );
 
 
 
@@ -146,12 +146,12 @@ PUBLIC void R_Draw_StretchPic( int x, int y, int w, int h, const char *pic )
 
 	R_Bind( gl->texnum );
 
-	pfglBegin( GL_QUADS );
+	pfglBegin( GL_TRIANGLE_STRIP );
 
 	pfglTexCoord2f( 0.0f, 0.0f );	pfglVertex2i( x, y );
+	pfglTexCoord2f( 0.0f, 1.0f );	pfglVertex2i( x, y+h );
 	pfglTexCoord2f( 1.0f, 0.0f );	pfglVertex2i( x+w, y );
 	pfglTexCoord2f( 1.0f, 1.0f );	pfglVertex2i( x+w, y+h );
-	pfglTexCoord2f( 0.0f, 1.0f );	pfglVertex2i( x, y+h );
 
 	pfglEnd();
 }
@@ -186,7 +186,7 @@ PUBLIC void R_Draw_Fill( int x, int y, int w, int h, colour3_t c )
 	c4[3] = 255;
 	R_Draw_Blend( x, y, w, h, c4 );
 #else
-	if ( revLand->value ) {
+	if ( deviceOrientation == ORIENTATION_LANDSCAPE_RIGHT ) {
 		qglScissor( x, y, w, h );
 	} else {
 		qglScissor( x, 320-(y+h), w, h );
@@ -203,12 +203,12 @@ PUBLIC void R_Draw_Blend( int x, int y, int w, int h, colour4_t c )
 	pfglDisable( GL_TEXTURE_2D );	
 	pfglColor4ubv( c );
 
-	pfglBegin( GL_QUADS );
+	pfglBegin( GL_TRIANGLE_STRIP );
 
 	pfglVertex2i( x, y );
+	pfglVertex2i( x, y+h );
 	pfglVertex2i( x+w, y );
 	pfglVertex2i( x+w, y+h );
-	pfglVertex2i( x, y+h );
 
 	pfglEnd();
 

wolf3d/code/env/opengl_local.h

@@ -131,6 +131,7 @@ typedef struct
 	const char *version_string;
 	const char *extensions_string;
 	_boolean Version_1_2;
+	bool framebuffer_discard;
 
 } glconfig_t;
 

wolf3d/code/env/opengl_main.c

@@ -284,7 +284,6 @@ PUBLIC void R_Init()
 	int		err;
 	int		a, b;
 
-
 	Com_Printf( "\n------ Display Initialization ------\n" );
 
 	Com_Printf( "Initializing OpenGL Subsystem\n" );
@@ -294,9 +293,6 @@ PUBLIC void R_Init()
 	// set our "safe" modes
 	gl_state.prev_mode = 0;
 
-	viddef.width = 480;
-	viddef.height = 320;
-
 	//	get various GL strings
 	gl_config.vendor_string = (char *)pfglGetString( GL_VENDOR );
 	Com_Printf( "GL_VENDOR: %s\n", gl_config.vendor_string );
@@ -316,7 +312,6 @@ PUBLIC void R_Init()
 	my_strlcpy( vendor_buffer, gl_config.vendor_string, sizeof( vendor_buffer ) );
 	(void)my_strlwr( vendor_buffer );
 
-
 	sscanf( gl_config.version_string, "%d.%d", &a, &b );
 	if( a >= 1 && b >= 2 )
 	{
@@ -326,6 +321,14 @@ PUBLIC void R_Init()
 	pfglGetIntegerv( GL_MAX_TEXTURE_SIZE, &glMaxTexSize );
 	Com_Printf( "GL_MAX_TEXTURE_SIZE: %d\n", glMaxTexSize);
 
+	if ( strstr( gl_config.extensions_string, "GL_EXT_discard_framebuffer" ) != 0 ) {
+		gl_config.framebuffer_discard = true;
+	} else {
+		gl_config.framebuffer_discard = false;
+	}
+
+	InitImmediateModeGL();
+
 	GL_SetDefaultState();
 
 	TM_Init();
@@ -359,7 +362,7 @@ PUBLIC void PrintGLError( W32 err, const char *from )
 		return;
 	}
 
-    if( from != "" )
+    if( strlen(from) != 0 )
 	{
 		Com_Printf( "\n\n\nGL Error: %s\n", from );
 	}