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

DREAMWEB: Improved code formatting

Browse Source
This commit is contained in:
Vladimir Menshakov 2011-06-16 16:31:17 +04:00
parent 5bd4e3ac6f
commit 4fd3cdf984
8 changed files with 3516 additions and 1797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/tasmrecover/tasm-recover
View File

@ -7,7 +7,7 @@ p = parser()
p.strip_path = 3
context = p.parse('dreamweb/dreamweb.asm')
p.link()
generator = cpp(context, "dreamgen", blacklist = [
generator = cpp(context, "DreamGen", blacklist = [
'randomnumber',
'quickquit',
'quickquit2',

32
devtools/tasmrecover/tasm/cpp.py
View File

@ -14,8 +14,8 @@ def parse_bin(s):
class cpp:
def __init__(self, context, namespace, skip_first = 0, blacklist = []):
self.namespace = namespace
fname = namespace + ".cpp"
header = namespace + ".h"
fname = namespace.lower() + ".cpp"
header = namespace.lower() + ".h"
banner = "/* PLEASE DO NOT MODIFY THIS FILE. ALL CHANGES WILL BE LOST! LOOK FOR README FOR DETAILS */"
self.fd = open(fname, "wt")
self.hd = open(header, "wt")
@ -348,34 +348,34 @@ namespace %s {
self.body += "\tcontext._test(%s, %s);\n" %self.parse2(a, b)
def _js(self, label):
self.body += "\tif (context.flags.s()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (context.flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jns(self, label):
self.body += "\tif (!context.flags.s()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (!context.flags.s())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jz(self, label):
self.body += "\tif (context.flags.z()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (context.flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jnz(self, label):
self.body += "\tif (!context.flags.z()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (!context.flags.z())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jl(self, label):
self.body += "\tif (context.flags.l()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (context.flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jg(self, label):
self.body += "\tif (!context.flags.le()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (!context.flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jle(self, label):
self.body += "\tif (context.flags.le()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (context.flags.le())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jge(self, label):
self.body += "\tif (!context.flags.l()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (!context.flags.l())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jc(self, label):
self.body += "\tif (context.flags.c()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (context.flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
def _jnc(self, label):
self.body += "\tif (!context.flags.c()) %s;\n" %(self.jump_to_label(label))
self.body += "\tif (!context.flags.c())\n\t\t%s;\n" %(self.jump_to_label(label))
def _xchg(self, dst, src):
self.body += "\tcontext._xchg(%s, %s);\n" %self.parse2(dst, src)
@ -384,7 +384,7 @@ namespace %s {
self.body += "\t%s;\n" %(self.jump_to_label(label))
def _loop(self, label):
self.body += "\tif (--context.cx) %s;\n" %self.jump_to_label(label)
self.body += "\tif (--context.cx)\n\t\t%s;\n" %self.jump_to_label(label)
def _push(self, regs):
p = str();
@ -403,7 +403,7 @@ namespace %s {
self.body += p
def _rep(self):
self.body += "\twhile(context.cx--) "
self.body += "\twhile(context.cx--)\n\t"
def _lodsb(self):
self.body += "\tcontext._lodsb();\n"
@ -418,10 +418,10 @@ namespace %s {
self.body += "\tcontext._stosw(%s);\n" %("" if n == 1 else n)
def _movsb(self, n):
self.body += "\tcontext._movsb(%s);\n " %("" if n == 1 else n)
self.body += "\tcontext._movsb(%s);\n" %("" if n == 1 else n)
def _movsw(self, n):
self.body += "\tcontext._movsw(%s);\n " %("" if n == 1 else n)
self.body += "\tcontext._movsw(%s);\n" %("" if n == 1 else n)
def _stc(self):
self.body += "\tcontext.flags._c = true;\n "

5218
engines/dreamweb/dreamgen.cpp
View File

File diff suppressed because it is too large Load Diff

2
engines/dreamweb/dreamgen.h
View File

@ -6,7 +6,7 @@
#include "dreamweb/runtime.h"
namespace dreamgen {
namespace DreamGen {
void __dispatch_call(Context &context, unsigned addr);
void __start(Context &context);

52
engines/dreamweb/dreamweb.cpp
View File

@ -42,10 +42,10 @@
#include "dreamweb/dreamweb.h"
#include "dreamweb/dreamgen.h"
namespace dreamgen {
void doshake(dreamgen::Context &context);
void dofade(dreamgen::Context &context);
void volumeadjust(dreamgen::Context &context);
namespace DreamGen {
void doshake(DreamGen::Context &context);
void dofade(DreamGen::Context &context);
void volumeadjust(DreamGen::Context &context);
}
namespace DreamWeb {
@ -100,8 +100,8 @@ void DreamWebEngine::waitForVSync() {
setVSyncInterrupt(false);
}
dreamgen::doshake(_context);
dreamgen::dofade(_context);
DreamGen::doshake(_context);
DreamGen::dofade(_context);
_system->updateScreen();
}
@ -139,8 +139,8 @@ void DreamWebEngine::processEvents() {
break;
case Common::KEYCODE_c: //skip statue puzzle
_context.data.byte(dreamgen::kSymbolbotnum) = 3;
_context.data.byte(dreamgen::kSymboltopnum) = 5;
_context.data.byte(DreamGen::kSymbolbotnum) = 3;
_context.data.byte(DreamGen::kSymboltopnum) = 5;
break;
default:
@ -170,7 +170,7 @@ void DreamWebEngine::processEvents() {
break;
}
_context.data.byte(dreamgen::kLasthardkey) = hardKey;
_context.data.byte(DreamGen::kLasthardkey) = hardKey;
// The rest of the keys are converted to ASCII. This
// is fairly restrictive, and eventually we may want
@ -213,7 +213,7 @@ Common::Error DreamWebEngine::run() {
getTimerManager()->installTimerProc(vSyncInterrupt, 1000000 / 70, this);
//http://martin.hinner.info/vga/timing.html
dreamgen::__start(_context);
DreamGen::__start(_context);
getTimerManager()->removeTimerProc(vSyncInterrupt);
@ -294,13 +294,13 @@ uint DreamWebEngine::readFromSaveFile(uint8 *data, uint size) {
void DreamWebEngine::keyPressed(uint16 ascii) {
debug(2, "key pressed = %04x", ascii);
uint8* keybuf = _context.data.ptr(5912, 16); //fixme: some hardcoded offsets are not added as consts
uint16 in = (_context.data.word(dreamgen::kBufferin) + 1) & 0x0f;
uint16 out = _context.data.word(dreamgen::kBufferout);
uint16 in = (_context.data.word(DreamGen::kBufferin) + 1) & 0x0f;
uint16 out = _context.data.word(DreamGen::kBufferout);
if (in == out) {
warning("keyboard buffer is full");
return;
}
_context.data.word(dreamgen::kBufferin) = in;
_context.data.word(DreamGen::kBufferin) = in;
keybuf[in] = ascii;
}
@ -326,11 +326,11 @@ void DreamWebEngine::mouseCall() {
}
void DreamWebEngine::fadeDos() {
_context.ds = _context.es = _context.data.word(dreamgen::kBuffers);
_context.ds = _context.es = _context.data.word(DreamGen::kBuffers);
return; //fixme later
waitForVSync();
//processEvents will be called from vsync
uint8 *dst = _context.es.ptr(dreamgen::kStartpal, 768);
uint8 *dst = _context.es.ptr(DreamGen::kStartpal, 768);
getPalette(dst, 0, 64);
for(int fade = 0; fade < 64; ++fade) {
for(int c = 0; c < 768; ++c) { //original sources decrement 768 values -> 256 colors
@ -379,9 +379,9 @@ void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int
}
void DreamWebEngine::printUnderMonitor() {
_context.es = _context.data.word(dreamgen::kWorkspace);
_context.di = dreamgen::kScreenwidth * 43 + 76;
_context.si = _context.di + 8 * dreamgen::kScreenwidth;
_context.es = _context.data.word(DreamGen::kWorkspace);
_context.di = DreamGen::kScreenwidth * 43 + 76;
_context.si = _context.di + 8 * DreamGen::kScreenwidth;
Graphics::Surface *s = _system->lockScreen();
if (!s)
@ -397,8 +397,8 @@ void DreamWebEngine::printUnderMonitor() {
++dst; ++src;
}
}
_context._add(_context.di, dreamgen::kScreenwidth);
_context._add(_context.si, dreamgen::kScreenwidth);
_context._add(_context.di, DreamGen::kScreenwidth);
_context._add(_context.si, DreamGen::kScreenwidth);
}
_context.cx = 0;
_system->unlockScreen();
@ -480,7 +480,7 @@ void DreamWebEngine::soundHandler() {
volumeadjust(_context);
_context.ax = _context.pop();
uint volume = _context.data.byte(dreamgen::kVolume);
uint volume = _context.data.byte(DreamGen::kVolume);
//.vol file loaded into soundbuf:0x4000
//volume table at (volume * 0x100 + 0x3f00)
//volume value could be from 1 to 7
@ -496,13 +496,13 @@ void DreamWebEngine::soundHandler() {
volume = (8 - volume) * Audio::Mixer::kMaxChannelVolume / 8;
_mixer->setChannelVolume(_channelHandle[0], volume);
uint8 ch0 = _context.data.byte(dreamgen::kCh0playing);
uint8 ch0 = _context.data.byte(DreamGen::kCh0playing);
if (ch0 == 255)
ch0 = 0;
uint8 ch1 = _context.data.byte(dreamgen::kCh1playing);
uint8 ch1 = _context.data.byte(DreamGen::kCh1playing);
if (ch1 == 255)
ch1 = 0;
uint8 ch0loop = _context.data.byte(dreamgen::kCh0repeat);
uint8 ch0loop = _context.data.byte(DreamGen::kCh0repeat);
if (_channel0 != ch0) {
_channel0 = ch0;
@ -517,11 +517,11 @@ void DreamWebEngine::soundHandler() {
}
}
if (!_mixer->isSoundHandleActive(_channelHandle[0])) {
_context.data.byte(dreamgen::kCh0playing) = 255;
_context.data.byte(DreamGen::kCh0playing) = 255;
_channel0 = 0;
}
if (!_mixer->isSoundHandleActive(_channelHandle[1])) {
_context.data.byte(dreamgen::kCh1playing) = 255;
_context.data.byte(DreamGen::kCh1playing) = 255;
_channel1 = 0;
}

3
engines/dreamweb/dreamweb.h
View File

@ -74,7 +74,6 @@ public:
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
//dreamgen public api:
uint8 randomNumber() { return _rnd.getRandomNumber(255); }
void openFile(const Common::String &name);
@ -139,7 +138,7 @@ private:
Audio::SoundHandle _channelHandle[2];
uint8 _channel0, _channel1;
dreamgen::Context _context;
DreamGen::Context _context;
};
} // End of namespace DreamWeb

2
engines/dreamweb/runtime.h
View File

@ -13,7 +13,7 @@ namespace DreamWeb {
class DreamWebEngine;
}
namespace dreamgen {
namespace DreamGen {
//fixme: name clash
#undef random

2
engines/dreamweb/stubs.cpp
View File

@ -2,7 +2,7 @@
#include "engines/util.h"
#include "graphics/surface.h"
namespace dreamgen {
namespace DreamGen {
Common::String getFilename(Context &context) {
uint16 name_ptr = context.dx;