ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-02-22 11:31:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

From ludwig: Unsigned overflows don't work in 64bit address space ...

Browse source
This commit is contained in:
Zachary Slater 2005-08-27 18:10:36 +00:00
parent 157ad17c22
commit 916cb54d72
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
code/client/cl_cin.c
View file

@ -83,7 +83,7 @@ typedef struct {
byte file[65536]; byte file[65536];
short sqrTable[256]; short sqrTable[256];
unsigned int mcomp[256]; int mcomp[256];
byte *qStatus[2][32768]; byte *qStatus[2][32768];
long oldXOff, oldYOff, oldysize, oldxsize; long oldXOff, oldYOff, oldysize, oldxsize;
@ -1050,8 +1050,8 @@ static void readQuadInfo( byte *qData )
cinTable[currentHandle].VQ0 = cinTable[currentHandle].VQNormal; cinTable[currentHandle].VQ0 = cinTable[currentHandle].VQNormal;
cinTable[currentHandle].VQ1 = cinTable[currentHandle].VQBuffer; cinTable[currentHandle].VQ1 = cinTable[currentHandle].VQBuffer;
cinTable[currentHandle].t[0] = (0 - (unsigned int)cin.linbuf)+(unsigned int)cin.linbuf+cinTable[currentHandle].screenDelta; cinTable[currentHandle].t[0] = cinTable[currentHandle].screenDelta;
cinTable[currentHandle].t[1] = (0 - ((unsigned int)cin.linbuf + cinTable[currentHandle].screenDelta))+(unsigned int)cin.linbuf; cinTable[currentHandle].t[1] = -cinTable[currentHandle].screenDelta;
cinTable[currentHandle].drawX = cinTable[currentHandle].CIN_WIDTH; cinTable[currentHandle].drawX = cinTable[currentHandle].CIN_WIDTH;
cinTable[currentHandle].drawY = cinTable[currentHandle].CIN_HEIGHT; cinTable[currentHandle].drawY = cinTable[currentHandle].CIN_HEIGHT;
@ -1410,10 +1410,6 @@ e_status CIN_RunCinematic (int handle)
if (handle < 0 || handle>= MAX_VIDEO_HANDLES || cinTable[handle].status == FMV_EOF) return FMV_EOF; if (handle < 0 || handle>= MAX_VIDEO_HANDLES || cinTable[handle].status == FMV_EOF) return FMV_EOF;
#warning disabled CIN_RunCinematic
Com_Printf("XXX: %s disabled\n", __FUNCTION__);
return FMV_EOF;
if (cin.currentHandle != handle) { if (cin.currentHandle != handle) {
currentHandle = handle; currentHandle = handle;
cin.currentHandle = currentHandle; cin.currentHandle = currentHandle;
@ -1493,11 +1489,6 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
Com_sprintf (name, sizeof(name), "%s", arg); Com_sprintf (name, sizeof(name), "%s", arg);
} }
#warning disabled CIN_PlayCinematic
Com_Printf("XXX: %s disabled, not playing %s\n", __FUNCTION__, name);
return -1;
if (!(systemBits & CIN_system)) { if (!(systemBits & CIN_system)) {
for ( i = 0 ; i < MAX_VIDEO_HANDLES ; i++ ) { for ( i = 0 ; i < MAX_VIDEO_HANDLES ; i++ ) {
if (!strcmp(cinTable[i].fileName, name) ) { if (!strcmp(cinTable[i].fileName, name) ) {

6
code/unix/Makefile
View file

@ -179,6 +179,12 @@ ifeq ($(PLATFORM),linux)
LDFLAGS=-ldl -lm LDFLAGS=-ldl -lm
GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
ifeq ($(ARCH),i386)
# linux32 make ...
BASE_CFLAGS += -m32
LDFLAGS+=-m32
endif
ifeq ($(ARCH),axp) ifeq ($(ARCH),axp)
TARGETS=\ TARGETS=\
$(B)/$(PLATFORM)q3ded $(B)/$(PLATFORM)q3ded