diff options
| -rw-r--r-- | engines/wintermute/ad/ad_scene.cpp | 13 | ||||
| -rw-r--r-- | engines/wintermute/base/base_keyboard_state.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/base/base_parser.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font.cpp | 67 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/base_renderer.cpp | 1 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 4 |
6 files changed, 4 insertions, 86 deletions
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp index 76238c1850..f67252350e 100644 --- a/engines/wintermute/ad/ad_scene.cpp +++ b/engines/wintermute/ad/ad_scene.cpp @@ -2370,13 +2370,6 @@ bool AdScene::correctTargetPoint2(int startX, int startY, int *targetX, int *tar yLength = abs(y2 - y1);
if (xLength > yLength) {
- /*
- if (X1 > X2)
- {
- Swap(&X1, &X2);
- Swap(&Y1, &Y2);
- }
- */
yStep = fabs((double)(y2 - y1) / (double)(x2 - x1));
y = y1;
@@ -2390,12 +2383,6 @@ bool AdScene::correctTargetPoint2(int startX, int startY, int *targetX, int *tar y += yStep;
}
} else {
- /*
- if (Y1 > Y2) {
- Swap(&X1, &X2);
- Swap(&Y1, &Y2);
- }
- */
xStep = fabs((double)(x2 - x1) / (double)(y2 - y1));
x = x1;
diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp index 70d92784a5..63c0a873ce 100644 --- a/engines/wintermute/base/base_keyboard_state.cpp +++ b/engines/wintermute/base/base_keyboard_state.cpp @@ -92,9 +92,6 @@ bool BaseKeyboardState::scCallMethod(ScScript *script, ScStack *stack, ScStack * vKey = val->getInt();
}
- warning("BKeyboardState doesnt yet have state-support %d", vKey); //TODO;
-// Uint8 *state = SDL_GetKeyboardState(NULL);
-// SDL_Scancode scanCode = SDL_GetScancodeFromKey(VKeyToKeyCode(vKey));
bool isDown = _keyStates[vKeyToKeyCode(vKey)];
stack->pushBool(isDown);
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index bbbb5d69ba..007f93e443 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -79,7 +79,7 @@ int32 BaseParser::getObject(char **buf, const TokenDesc *tokens, char **name, ch }
// find the token.
- // for now just use brute force. Improve later.
+ // TODO: for now just use brute force. Improve later.
while (tokens->id != 0) {
if (!scumm_strnicmp(tokens->token, *buf, strlen(tokens->token))) {
// here we could be matching PART of a string
diff --git a/engines/wintermute/base/font/base_font.cpp b/engines/wintermute/base/font/base_font.cpp index 8fb2b2b44a..cb70c4add8 100644 --- a/engines/wintermute/base/font/base_font.cpp +++ b/engines/wintermute/base/font/base_font.cpp @@ -67,73 +67,6 @@ int BaseFont::getTextWidth(byte *text, int maxLength) { return 0;
}
-/*
-//////////////////////////////////////////////////////////////////////
-bool BaseFont::loadFile(const char * Filename)
-{
- BYTE* Buffer = BaseFileManager::getEngineInstance()->readWholeFile(filename);
- if (Buffer==NULL){
- _gameRef->LOG(0, "BaseFont::LoadFile failed for file '%s'", filename);
- return STATUS_FAILED;
- }
-
- bool ret;
-
- _filename = new char [strlen(filename)+1];
- strcpy(_filename, filename);
-
- if (DID_FAIL(ret = loadBuffer(Buffer))) _gameRef->LOG(0, "Error parsing FONT file '%s'", filename);
-
- delete[] Buffer;
-
- return ret;
-}
-
-
-TOKEN_DEF_START
- TOKEN_DEF (FONT)
-TOKEN_DEF_END
-//////////////////////////////////////////////////////////////////////
-bool BaseFont::loadBuffer(byte * Buffer)
-{
- TOKEN_TABLE_START(commands)
- TOKEN_TABLE (FONT)
- TOKEN_TABLE_END
-
- char* params;
- int cmd;
- BaseParser parser;
-
- if (parser.GetCommand ((char**)&Buffer, commands, (char**)¶ms)!=TOKEN_FONT){
- _gameRef->LOG(0, "'FONT' keyword expected.");
- return STATUS_FAILED;
- }
- Buffer = (byte *)params;
-
- while ((cmd = parser.GetCommand ((char**)&Buffer, commands, (char**)¶ms)) > 0)
- {
- switch (cmd)
- {
- case TOKEN_IMAGE:
- surface_file = (char*)params;
- break;
-
- case TOKEN_TRANSPARENT:
- parser.scanStr(params, "%d,%d,%d", &r, &g, &b);
- custo_trans = true;
- break;
- }
-
-
- }
- if (cmd == PARSERR_TOKENNOTFOUND){
- _gameRef->LOG(0, "Syntax error in FONT definition");
- return STATUS_FAILED;
- }
-
- return STATUS_OK;
-}
-*/
//////////////////////////////////////////////////////////////////////////
int BaseFont::getLetterHeight() {
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp index 9e271fc32d..202c864683 100644 --- a/engines/wintermute/base/gfx/base_renderer.cpp +++ b/engines/wintermute/base/gfx/base_renderer.cpp @@ -296,6 +296,7 @@ bool BaseRenderer::setViewport(Rect32 *rect) { //////////////////////////////////////////////////////////////////////////
bool BaseRenderer::clipCursor() {
+ // TODO: Reimplement this. (Currently aspect-indpendence isn't quite finished)
/*
if (!_windowed) {
Rect32 rc;
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index ea88f19065..7724a93481 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -176,7 +176,7 @@ bool BaseSurfaceOSystem::finishLoad() { void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) {
warning("BaseSurfaceOSystem::GenAlphaMask - Not ported yet");
return;
-
+ // TODO: Reimplement this
delete[] _alphaMask;
_alphaMask = NULL;
if (!surface) {
@@ -190,7 +190,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) { hasColorKey = true;
SDL_GetRGB(colorKey, surface->format, &ckRed, &ckGreen, &ckBlue);
} else hasColorKey = false;
- */ //TODO
+ */
_alphaMask = new byte[surface->w * surface->h];
bool hasTransparency = false;
|