OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Backport r1253 through r1256 and r1259 of GZDoom.

Browse source 
* By pressing request, allow Linux users to build ZDoom with an FMOD version that doesn't give them 3D sound positioning. :p
	* Fixed severe copy-pasta portal copy bug.
	* 3D floors hidden by being moved above the ceiling or below the floor will no longer show in the automap.
	* Reject TEXTURES scale of 0. They'd do nothing but provoke a division by zero error.
	* Maybe fixed Linux compilation?

SVN r3297 (trunk)
This commit is contained in:
Braden Obrzut 2011-09-27 01:14:31 +00:00
commit 9c8bb236ec
5 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sdl/i_system.cpp
View file

@ -855,15 +855,15 @@ struct SDL_PrivateVideoData
struct SDL_VideoDevice
{
const char *name;
int (*functions)()[9];
int (*functions[9])();
SDL_VideoInfo info;
SDL_PixelFormat *displayformatalphapixel;
int (*morefuncs)()[9];
int (*morefuncs[9])();
Uint16 *gamma;
int (*somefuncs)()[9];
int (*somefuncs[9])();
unsigned int texture; // Only here if SDL was compiled with OpenGL support. Ack!
int is_32bit;
int (*itsafuncs)()[13];
int (*itsafuncs[13])();
SDL_Surface *surfaces[3];
SDL_Palette *physpal;
SDL_Color *gammacols;
@ -874,7 +874,7 @@ struct SDL_VideoDevice
SDL_PrivateVideoData *hidden; // Why did they have to bury this so far in?
};
extern SDL_VideDevice *current_video;
extern SDL_VideoDevice *current_video;
#define SDL_Display (current_video->hidden->X11_Display)
SDL_Cursor *CreateColorCursor(FTexture *cursorpic)