Skip to content

Commit

Permalink
From ludwig: Unsigned overflows don't work in 64bit address space ...
Browse files Browse the repository at this point in the history
  • Loading branch information
NuclearMonster committed Aug 27, 2005
1 parent 157ad17 commit 916cb54
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 12 deletions.
15 changes: 3 additions & 12 deletions code/client/cl_cin.c
Expand Up @@ -83,7 +83,7 @@ typedef struct {
byte file[65536];
short sqrTable[256];

unsigned int mcomp[256];
int mcomp[256];
byte *qStatus[2][32768];

long oldXOff, oldYOff, oldysize, oldxsize;
Expand Down Expand Up @@ -1050,8 +1050,8 @@ static void readQuadInfo( byte *qData )
cinTable[currentHandle].VQ0 = cinTable[currentHandle].VQNormal;
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[1] = (0 - ((unsigned int)cin.linbuf + cinTable[currentHandle].screenDelta))+(unsigned int)cin.linbuf;
cinTable[currentHandle].t[0] = cinTable[currentHandle].screenDelta;
cinTable[currentHandle].t[1] = -cinTable[currentHandle].screenDelta;

cinTable[currentHandle].drawX = cinTable[currentHandle].CIN_WIDTH;
cinTable[currentHandle].drawY = cinTable[currentHandle].CIN_HEIGHT;
Expand Down Expand Up @@ -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;

#warning disabled CIN_RunCinematic
Com_Printf("XXX: %s disabled\n", __FUNCTION__);
return FMV_EOF;

if (cin.currentHandle != handle) {
currentHandle = handle;
cin.currentHandle = currentHandle;
Expand Down Expand Up @@ -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);
}

#warning disabled CIN_PlayCinematic
Com_Printf("XXX: %s disabled, not playing %s\n", __FUNCTION__, name);
return -1;


if (!(systemBits & CIN_system)) {
for ( i = 0 ; i < MAX_VIDEO_HANDLES ; i++ ) {
if (!strcmp(cinTable[i].fileName, name) ) {
Expand Down
6 changes: 6 additions & 0 deletions code/unix/Makefile
Expand Up @@ -179,6 +179,12 @@ ifeq ($(PLATFORM),linux)
LDFLAGS=-ldl -lm
GLLDFLAGS=-L/usr/X11R6/$(LIB) -lX11 -lXext -lXxf86dga -lXxf86vm

ifeq ($(ARCH),i386)
# linux32 make ...
BASE_CFLAGS += -m32
LDFLAGS+=-m32
endif

ifeq ($(ARCH),axp)
TARGETS=\
$(B)/$(PLATFORM)q3ded
Expand Down

0 comments on commit 916cb54

Please sign in to comment.