[Scummvm-cvs-logs] CVS: scummvm Makefile.irix,NONE,1.1 boxes.cpp,1.24,1.25 gfx.cpp,1.72,1.73 object.cpp,1.59,1.60 saveload.cpp,1.40,1.41 script_v1.cpp,1.85,1.86 script_v2.cpp,1.45,1.46 scumm.h,1.130,1.131 scummsys.h,1.28,1.29 scummvm.cpp,1.119,1.120
James Brown
ender at users.sourceforge.net
Fri Apr 19 21:10:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm object.cpp,1.58,1.59 script.cpp,1.49,1.50 script_v1.cpp,1.84,1.85 scumm.h,1.129,1.130 scummvm.cpp,1.118,1.119
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.20,1.21 simon.h,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv23320
Modified Files:
boxes.cpp gfx.cpp object.cpp saveload.cpp script_v1.cpp
script_v2.cpp scumm.h scummsys.h scummvm.cpp
Added Files:
Makefile.irix
Log Message:
Remove \M's, add IRIX support.
--- NEW FILE: Makefile.irix ---
CC = CC
CFLAGS = -O2 -Olimit 9000 -mips2
#CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
# Remove -DHAVE_NO_BOOL if your compiler has a builtin bool type
DEFINES = -DUNIX -DHAVE_NO_BOOL -DCOMPRESSED_SOUND_FILE
LDFLAGS :=
INCLUDES:= `sdl-config --cflags` -I./ -I./sound
CPPFLAGS= $(DEFINES) $(INCLUDES)
# Add -lmad for -DCOMPRESSED_SOUND_FILE
LIBS = `sdl-config --libs` -lmad -lm
ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
INCS = scumm.h scummsys.h stdafx.h
OBJS = actor.o boxes.o costume.o gfx.o object.o resource.o \
saveload.o script.o scummvm.o sound.o string.o \
sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
sound/imuse.o sound/fmopl.o sound/mixer.o debugrl.o \
akos.o vars.o insane.o gameDetector.o init.o \
v3/resource_v3.o v4/resource_v4.o 2xsai.o main.o \
simon/midi.o simon/simon.o simon/simonsys.o sound/mididrv.o
DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
debugrl.h whatsnew.txt readme.txt copying.txt \
scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h \
.cpp.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
all: scummvm
scummvm: $(OBJS)
$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
$(OBJS): Makefile
clean:
rm -f $(OBJS) scummvm
dist:
rm -f $(ZIPFILE)
zip -q $(ZIPFILE) $(DISTFILES)
check:
$(OBJS): $(INCS)
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** boxes.cpp 17 Apr 2002 21:44:19 -0000 1.24
--- boxes.cpp 20 Apr 2002 04:09:01 -0000 1.25
***************
*** 29,33 ****
Box *ptr = getBoxBaseAddr(box);
if (!ptr)
! return 0;
return ptr->mask;
}
--- 29,34 ----
Box *ptr = getBoxBaseAddr(box);
if (!ptr)
! return 0;
!
return ptr->mask;
}
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** gfx.cpp 19 Apr 2002 13:57:17 -0000 1.72
--- gfx.cpp 20 Apr 2002 04:09:01 -0000 1.73
***************
*** 2639,2706 ****
CHECK_HEAP;
}
!
! void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax)
! {
! byte *palPtr;
! byte *curPtr;
! byte *searchPtr;
!
! byte colorComp1;
! byte colorComp2;
! byte colorComp3;
!
! byte searchComp1;
! byte searchComp2;
! byte searchComp3;
!
! short int bestResult;
! short int currentResult;
! byte currentIndex;
!
! int i;
! int j;
!
! palPtr = getPalettePtr();
!
! for(i=colorMin;i<colorMax;i++)
! _proc_special_palette[i]=i;
!
! curPtr = palPtr + colorMin*3;
!
! for(i=colorMin;i<colorMax;i++)
! {
! /* colorComp1=((((*curPtr++)>>2)*c)>>8)&0x7F;
! colorComp2=((((*curPtr++)>>2)*d)>>8)&0x7F;
! colorComp3=((((*curPtr++)>>2)*e)>>8)&0x7F;*/
!
! /* Yazoo: I can't get the right formula, so I made one that just work fine with SamnMax flashlight */
!
! colorComp1=(*curPtr++)+10;
! colorComp2=(*curPtr++)+10;
! colorComp3=(*curPtr++)+10;
!
!
! searchPtr = palPtr;
! bestResult = 0x7FFF;
! currentIndex = 0;
!
! for(j=0;j<256;j++)
! {
! searchComp1 = (*searchPtr++);
! searchComp2 = (*searchPtr++);
! searchComp3 = (*searchPtr++);
!
! currentResult = abs(searchComp1-colorComp1) + abs(searchComp2-colorComp2) + abs(searchComp3-colorComp3);
!
! if(currentResult<bestResult)
! if(currentIndex >= a && currentIndex <= b)
! {
! _proc_special_palette[i]=currentIndex;
! bestResult=currentResult;
! }
!
! currentIndex++;
! }
!
! }
}
--- 2639,2771 ----
CHECK_HEAP;
}
!
!
! void Scumm::createSpecialPalette(int16 a, int16 b, int16 c, int16 d, int16 e, int16 colorMin, int16 colorMax)
!
! {
!
! byte *palPtr;
!
! byte *curPtr;
!
! byte *searchPtr;
!
!
!
! byte colorComp1;
!
! byte colorComp2;
!
! byte colorComp3;
!
!
!
! byte searchComp1;
!
! byte searchComp2;
!
! byte searchComp3;
!
!
!
! short int bestResult;
!
! short int currentResult;
!
! byte currentIndex;
!
!
!
! int i;
!
! int j;
!
!
!
! palPtr = getPalettePtr();
!
!
!
! for(i=colorMin;i<colorMax;i++)
!
! _proc_special_palette[i]=i;
!
!
!
! curPtr = palPtr + colorMin*3;
!
!
!
! for(i=colorMin;i<colorMax;i++)
!
! {
!
! /* colorComp1=((((*curPtr++)>>2)*c)>>8)&0x7F;
!
! colorComp2=((((*curPtr++)>>2)*d)>>8)&0x7F;
!
! colorComp3=((((*curPtr++)>>2)*e)>>8)&0x7F;*/
!
!
!
! /* Yazoo: I can't get the right formula, so I made one that just work fine with SamnMax flashlight */
!
!
!
! colorComp1=(*curPtr++)+10;
!
! colorComp2=(*curPtr++)+10;
!
! colorComp3=(*curPtr++)+10;
!
!
!
!
!
! searchPtr = palPtr;
!
! bestResult = 0x7FFF;
!
! currentIndex = 0;
!
!
!
! for(j=0;j<256;j++)
!
! {
!
! searchComp1 = (*searchPtr++);
!
! searchComp2 = (*searchPtr++);
!
! searchComp3 = (*searchPtr++);
!
!
!
! currentResult = abs(searchComp1-colorComp1) + abs(searchComp2-colorComp2) + abs(searchComp3-colorComp3);
!
!
!
! if(currentResult<bestResult)
!
! if(currentIndex >= a && currentIndex <= b)
!
! {
!
! _proc_special_palette[i]=currentIndex;
!
! bestResult=currentResult;
!
! }
!
!
!
! currentIndex++;
!
! }
!
!
!
! }
!
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** object.cpp 19 Apr 2002 21:06:49 -0000 1.59
--- object.cpp 20 Apr 2002 04:09:01 -0000 1.60
***************
*** 44,48 ****
cls &= 0x7F;
checkRange(32, 1, cls, "Class %d out of range in getClass");
!
if (_features & GF_SMALL_HEADER) {
if (cls == 32) // CLASS_TOUCHABLE
--- 44,49 ----
cls &= 0x7F;
checkRange(32, 1, cls, "Class %d out of range in getClass");
!
!
if (_features & GF_SMALL_HEADER) {
if (cls == 32) // CLASS_TOUCHABLE
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** saveload.cpp 19 Apr 2002 14:01:07 -0000 1.40
--- saveload.cpp 20 Apr 2002 04:09:01 -0000 1.41
***************
*** 466,470 ****
MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
MKLINE(Scumm, gdi._transparency, sleByte),
! MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
/* virtscr */
--- 466,471 ----
MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
MKLINE(Scumm, gdi._transparency, sleByte),
! MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
!
/* virtscr */
***************
*** 566,570 ****
MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
MKLINE(Scumm, gdi._transparency, sleByte),
! MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
MKARRAY(Scumm, _proc_special_palette[0], sleByte, 256),
/* virtscr */
--- 567,572 ----
MKARRAY(Scumm, gfxUsageBits[0], sleUint32, 200),
MKLINE(Scumm, gdi._transparency, sleByte),
! MKARRAY(Scumm, _currentPalette[0], sleByte, 768),
!
MKARRAY(Scumm, _proc_special_palette[0], sleByte, 256),
/* virtscr */
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** script_v1.cpp 19 Apr 2002 21:06:50 -0000 1.85
--- script_v1.cpp 20 Apr 2002 04:09:01 -0000 1.86
***************
*** 836,842 ****
continue;
}
!
! if(_gameId == GID_INDY3_256)
! newClass--;
if (newClass & 0x80)
--- 836,845 ----
continue;
}
!
!
! if(_gameId == GID_INDY3_256)
!
! newClass--;
!
if (newClass & 0x80)
***************
*** 1305,1323 ****
{
int actor;
! getResultPos();
! if(_gameId == GID_INDY3_256)
! actor = getVarOrDirectByte(0x80);
else
! actor = getVarOrDirectWord(0x80);
setResult(getObjX(actor));
}
void Scumm::o5_getActorY()
! {
int actor;
! getResultPos();
! if(_gameId == GID_INDY3_256)
! actor = getVarOrDirectByte(0x80);
! else
actor = getVarOrDirectWord(0x80);
setResult(getObjY(actor));
--- 1308,1335 ----
{
int actor;
! getResultPos();
!
! if(_gameId == GID_INDY3_256)
!
! actor = getVarOrDirectByte(0x80);
!
else
! actor = getVarOrDirectWord(0x80);
!
setResult(getObjX(actor));
}
void Scumm::o5_getActorY()
! {
!
int actor;
! getResultPos();
!
! if(_gameId == GID_INDY3_256)
!
! actor = getVarOrDirectByte(0x80);
!
! else
!
actor = getVarOrDirectWord(0x80);
setResult(getObjY(actor));
***************
*** 1325,1335 ****
void Scumm::o5_getAnimCounter()
! {
Actor *a;
! getResultPos();
! a=derefActorSafe(getVarOrDirectByte(0x80),"o5_getActorAnimCounter");
if(a) // FIXME
! setResult(a->cost.animCounter1);
! else
setResult(0);
}
--- 1337,1352 ----
void Scumm::o5_getAnimCounter()
! {
!
Actor *a;
! getResultPos();
!
! a=derefActorSafe(getVarOrDirectByte(0x80),"o5_getActorAnimCounter");
!
if(a) // FIXME
! setResult(a->cost.animCounter1);
!
! else
!
setResult(0);
}
***************
*** 2207,2211 ****
void Scumm::o5_startMusic()
! {
addSoundToQueue(getVarOrDirectByte(0x80));
}
--- 2224,2229 ----
void Scumm::o5_startMusic()
! {
!
addSoundToQueue(getVarOrDirectByte(0x80));
}
***************
*** 2244,2249 ****
void Scumm::o5_startSound()
! {
! _vars[VAR_MUSIC_FLAG]=0;
addSoundToQueue(getVarOrDirectByte(0x80));
}
--- 2262,2269 ----
void Scumm::o5_startSound()
! {
!
! _vars[VAR_MUSIC_FLAG]=0;
!
addSoundToQueue(getVarOrDirectByte(0x80));
}
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** script_v2.cpp 19 Apr 2002 13:57:17 -0000 1.45
--- script_v2.cpp 20 Apr 2002 04:09:01 -0000 1.46
***************
*** 2798,2802 ****
case 108: /* create proc_special_palette */
! case 109:
createSpecialPalette(args[1], args[2],args[3], args[4], args[5], 0, 256);
break;
--- 2798,2803 ----
case 108: /* create proc_special_palette */
! case 109:
!
createSpecialPalette(args[1], args[2],args[3], args[4], args[5], 0, 256);
break;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** scumm.h 19 Apr 2002 21:06:50 -0000 1.130
--- scumm.h 20 Apr 2002 04:09:02 -0000 1.131
***************
*** 25,29 ****
#define SCUMMVM_VERSION "0.2.0 devel"
! #define SCUMMVM_CVS "031402"
#define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
--- 25,29 ----
#define SCUMMVM_VERSION "0.2.0 devel"
! #define SCUMMVM_CVS "042002"
#define SWAP(a,b) do{int tmp=a; a=b; b=tmp; } while(0)
***************
*** 958,962 ****
uint16 _mouthSyncTimes[52];
uint _curSoundPos;
! int current_cd_sound;
int tempMusic;
--- 958,963 ----
uint16 _mouthSyncTimes[52];
uint _curSoundPos;
! int current_cd_sound;
!
int tempMusic;
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** scummsys.h 14 Apr 2002 19:43:11 -0000 1.28
--- scummsys.h 20 Apr 2002 04:09:02 -0000 1.29
***************
*** 20,23 ****
--- 20,28 ----
*/
+ #if defined(HAVE_NO_BOOL)
+ typedef int bool;
+ const bool true(1), false(0);
+ #endif /* HAVE_NO_BOOL */
+
#if defined(_MSC_VER)
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** scummvm.cpp 19 Apr 2002 21:06:50 -0000 1.119
--- scummvm.cpp 20 Apr 2002 04:09:02 -0000 1.120
***************
*** 53,58 ****
int i;
Actor *a;
!
! tempMusic=0;
debug(9, "scummInit");
--- 53,60 ----
int i;
Actor *a;
!
!
! tempMusic=0;
!
debug(9, "scummInit");
***************
*** 254,270 ****
}
}
! } else if (_features & GF_OLD256)
! {
! if(tempMusic == 3)
! {
tempMusic = 0;
! _vars[VAR_MUSIC_FLAG]++;
! }
! else
! {
! tempMusic ++;
! }
}
!
if (_saveLoadFlag) {
if (_saveLoadFlag == 1) {
--- 256,283 ----
}
}
! } else if (_features & GF_OLD256)
!
! {
!
! if(tempMusic == 3)
!
! {
!
tempMusic = 0;
! _vars[VAR_MUSIC_FLAG]++;
!
! }
!
! else
!
! {
!
! tempMusic ++;
!
! }
!
}
!
!
if (_saveLoadFlag) {
if (_saveLoadFlag == 1) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm object.cpp,1.58,1.59 script.cpp,1.49,1.50 script_v1.cpp,1.84,1.85 scumm.h,1.129,1.130 scummvm.cpp,1.118,1.119
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.20,1.21 simon.h,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list