Cleanup after merge

skyjake · Jan 19, 2004 · 881d54a · 881d54a
1 parent a2a88bf
commit 881d54a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 31 deletions.
diff --git a/doomsday/Src/gl_tex.c b/doomsday/Src/gl_tex.c
@@ -96,7 +96,8 @@ typedef struct dtexinst_s {
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
 
-void	averageColorIdx(rgbcol_t *sprcol, byte *data, int w, int h, byte *palette, boolean has_alpha);
+void	averageColorIdx(rgbcol_t *sprcol, byte *data, int w, int h,
+						byte *palette, boolean has_alpha);
 void	averageColorRGB(rgbcol_t *col, byte *data, int w, int h);
 byte*	GL_LoadHighResFlat(image_t *img, char *name);
 void	GL_DeleteDetailTexture(detailtex_t *dtex);
@@ -3102,10 +3103,9 @@ void GL_SetPatch(int lump)
 	curtex = lumptexinfo[lump].tex[0];
 }
 
-//===========================================================================
-// GL_SetNoTexture
-//	You should use Disable(DGL_TEXTURING) instead of this.
-//===========================================================================
+/*
+ * You should use Disable(DGL_TEXTURING) instead of this.
+ */
 void GL_SetNoTexture(void)
 {
 	gl.Bind(0);

diff --git a/doomsday/Src/r_main.c b/doomsday/Src/r_main.c
@@ -87,9 +87,6 @@ double		lastSharpFrameTime;
 
 // PRIVATE DATA DEFINITIONS ------------------------------------------------
 
-static viewer_t lastSharpView[2];
-static boolean	resetNextViewer = true;
-
 // CODE --------------------------------------------------------------------
 
 //==========================================================================
@@ -189,14 +186,6 @@ void R_Shutdown(void)
 	// Most allocated memory goes down with the zone.
 }
 
-//===========================================================================
-// R_ResetViewer
-//===========================================================================
-void R_ResetViewer(void)
-{
-	resetNextViewer = true;
-}
-
 //===========================================================================
 // R_InterpolateViewer
 //===========================================================================

diff --git a/doomsday/Src/r_world.c b/doomsday/Src/r_world.c
@@ -1399,9 +1399,6 @@ void R_SetupLevel(char *level_id, int flags)
 	P_SpawnTypeParticleGens();
 	P_SpawnMapParticleGens(level_id);
 
-	// Make sure that the next frame doesn't use a filtered viewer.
-	R_ResetViewer();
-
 	// Texture animations should begin from their first step.
 	R_ResetAnimGroups();
 

diff --git a/doomsday/Src/sys_system.c b/doomsday/Src/sys_system.c
@@ -1,5 +1,5 @@
 /* DE1: $Id$
- * Copyright (C) 2003 Jaakko Ker�en <jaakko.keranen@iki.fi>
+ * Copyright (C) 2003 Jaakko Keränen <jaakko.keranen@iki.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -277,7 +277,7 @@ int Sys_StartThread(systhreadfunc_t startPos, void *parm, int priority)
 	}
 	return (int) handle;
 #else
-	return (int) SDL_CreateThread(startpos, parm);
+	return (int) SDL_CreateThread(startPos, parm);
 #endif
 }
 
@@ -361,6 +361,20 @@ void Sem_P(semaphore_t semaphore)
 		SDL_SemWait((SDL_sem*)semaphore);
 	}
 }
+
+/*
+ * "Verhogen" a semaphore. Returns immediately.
+ */
+void Sem_V(semaphore_t semaphore)
+{
+	if(semaphore)
+	{
+		SDL_SemPost((SDL_sem*)semaphore);
+	}
+}
+
+#ifdef WIN32
+#if 0
 /*
  * Return the exit code of the given thread. Returns true if the thread
  * has stopped, false if not.
@@ -381,6 +395,7 @@ boolean Sys_GetThreadExitCode(int handle, uint *exitCode)
 	if(exitCode) *exitCode = code;
 	return true;
 }
+#endif
 
 /*
  * Create a new mutex. Returns a handle with which the mutex can be acquired
@@ -421,13 +436,4 @@ void Sys_Unlock(int mutexHandle)
 {
 	ReleaseMutex((HANDLE)mutexHandle);
 }
-/*
- * "Verhogen" a semaphore. Returns immediately.
- */
-void Sem_V(semaphore_t semaphore)
-{
-	if(semaphore)
-	{
-		SDL_SemPost((SDL_sem*)semaphore);
-	}
-}
+#endif