libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source 
svn-id: r39241
This commit is contained in:
Max Horn 2009-03-08 18:58:09 +00:00
parent 6c0ac7f692
commit 85f6f20419
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/agi/preagi.cpp
View File

@ -30,8 +30,6 @@
#include "base/plugins.h"
#include "base/version.h"
#include "graphics/cursorman.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"

15
engines/agos/script_pn.cpp
View File

@ -711,10 +711,9 @@ int AGOSEngine_PN::inventoryOff() {
// -----------------------------------------------------------------------
static int bitvalue[8] = {128, 64, 32, 16, 8, 4, 2, 1};
int AGOSEngine_PN::bitextract(uint32 ptr, int offs) {
return ((bitvalue[offs % 8] & _dataBase[ptr + offs / 8]) != 0);
const byte mask = 0x80 >> (offs % 8);
return ((mask & _dataBase[ptr + offs / 8]) != 0);
}
uint16 AGOSEngine_PN::getptr(uint32 pos) {
@ -823,9 +822,11 @@ void AGOSEngine_PN::writeval(uint8 *ptr, int val) {
void AGOSEngine_PN::setbitf(uint32 ptr, int offs, int val) {
ptr += offs / 8;
_dataBase[ptr] &= (255 - bitvalue[offs % 8]);
const byte mask = 0x80 >> (offs % 8);
if (val != 0)
_dataBase[ptr] |= bitvalue[offs % 8];
_dataBase[ptr] |= mask;
else
_dataBase[ptr] &= ~mask;
}
int AGOSEngine_PN::actCallD(int n) {
@ -970,7 +971,7 @@ int AGOSEngine_PN::gvwrd(uint8 *wptr, int mask) {
int val, code, q = _dataBase[57];
uint8 *vocbase = _dataBase + getlong(15);
while (*vocbase != 255) {
if (*vocbase < 128) {
if (*vocbase < 0x80) {
val = vocbase[q] + 256 * vocbase[q + 1];
code = vocbase[q + 2];
}
@ -981,6 +982,8 @@ int AGOSEngine_PN::gvwrd(uint8 *wptr, int mask) {
return -1;
}
// FIXME/TODO: Isn't this just scumm_strnicmp ?
int AGOSEngine_PN::samewrd(uint8 *w1, uint8 *w2, int ln) {
int ct = 0;

18
engines/agos/vga_pn.cpp
View File

@ -90,23 +90,23 @@ void AGOSEngine_PN::setupVideoOpcodes(VgaOpcodeProc *op) {
bool AGOSEngine_PN::ifObjectHere(uint16 a) {
if (getFeatures() & GF_DEMO)
return 0;
else
return _variableArray[39] == getptr(_quickptr[11] + a * _quickshort[4] + 2);
return false;
return _variableArray[39] == getptr(_quickptr[11] + a * _quickshort[4] + 2);
}
bool AGOSEngine_PN::ifObjectAt(uint16 a, uint16 b) {
if (getFeatures() & GF_DEMO)
return 0;
else
return b == getptr(_quickptr[11] + a * _quickshort[4] + 2);
return false;
return b == getptr(_quickptr[11] + a * _quickshort[4] + 2);
}
bool AGOSEngine_PN::ifObjectState(uint16 a, int16 b) {
if (getFeatures() & GF_DEMO)
return 0;
else
return b == getptr(_quickptr[0] + a * _quickshort[0] + 2);
return false;
return b == getptr(_quickptr[0] + a * _quickshort[0] + 2);
}
void AGOSEngine::vc36_pause() {