[Scummvm-cvs-logs] SF.net SVN: scummvm:[41620] scummvm/branches/gsoc2009-draci/engines/draci
dkasak13 at users.sourceforge.net
dkasak13 at users.sourceforge.net
Thu Jun 18 02:33:16 CEST 2009
Revision: 41620
http://scummvm.svn.sourceforge.net/scummvm/?rev=41620&view=rev
Author: dkasak13
Date: 2009-06-18 00:33:16 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
Changed _screenWidth and _screenHeight from member variables to constants because the screen size doesn't change.
Modified Paths:
--------------
scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
scummvm/branches/gsoc2009-draci/engines/draci/draci.h
scummvm/branches/gsoc2009-draci/engines/draci/screen.cpp
scummvm/branches/gsoc2009-draci/engines/draci/screen.h
Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp 2009-06-17 23:36:00 UTC (rev 41619)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp 2009-06-18 00:33:16 UTC (rev 41620)
@@ -52,9 +52,6 @@
// However this is the place to specify all default directories
//Common::File::addDefaultDirectory(_gameDataPath + "sound/");
- _screenHeight = 200;
- _screenWidth = 320;
-
// Here is the right place to set up the engine specific debug levels
Common::addDebugChannel(kDraciGeneralDebugLevel, "general", "Draci general debug level");
Common::addDebugChannel(kDraciBytecodeDebugLevel, "bytecode", "GPL bytecode instructions");
@@ -66,7 +63,7 @@
int DraciEngine::init() {
// Initialize graphics using following:
- initGraphics(_screenWidth, _screenHeight, false);
+ initGraphics(kScreenWidth, kScreenHeight, false);
_screen = new Screen(this);
_font = new Font();
@@ -140,13 +137,13 @@
Common::String testString = "Testing, testing, read all about it!";
Graphics::Surface *surf = _screen->getSurface();
_font->drawString(surf, testString,
- (320 - _font->getStringWidth(testString, 1)) / 2, 130, 1);
+ (kScreenWidth - _font->getStringWidth(testString, 1)) / 2, 130, 1);
// Draw small string
_font->setFont(kFontSmall);
testString = "I'm smaller than the font above me.";
_font->drawString(surf, testString,
- (320 - _font->getStringWidth(testString, 1)) / 2, 150, 1);
+ (kScreenWidth - _font->getStringWidth(testString, 1)) / 2, 150, 1);
// Overflow handling test
testString = "Checking overflooooooooooooooooooooooooow...";
@@ -168,7 +165,7 @@
// Load frame to memory
f = ar[t];
- Sprite sp(f->_data, f->_length, ((320 - 50) / 2), 60, true);
+ Sprite sp(f->_data, f->_length, ((kScreenWidth - 50) / 2), 60, true);
_screen->drawSprite(sp);
_screen->copyToScreen();
_system->delayMillis(100);
Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.h 2009-06-17 23:36:00 UTC (rev 41619)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.h 2009-06-18 00:33:16 UTC (rev 41620)
@@ -49,9 +49,6 @@
Font *_font;
Screen *_screen;
- int _screenWidth;
- int _screenHeight;
-
private:
Common::RandomSource _rnd;
};
Modified: scummvm/branches/gsoc2009-draci/engines/draci/screen.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/screen.cpp 2009-06-17 23:36:00 UTC (rev 41619)
+++ scummvm/branches/gsoc2009-draci/engines/draci/screen.cpp 2009-06-18 00:33:16 UTC (rev 41620)
@@ -30,11 +30,13 @@
namespace Draci {
+const int kScreenWidth = 320;
+const int kScreenHeight = 200;
const uint16 kNumColours = 256;
Screen::Screen(DraciEngine *vm) : _vm(vm) {
_surface = new Graphics::Surface();
- _surface->create(_vm->_screenWidth, _vm->_screenHeight, 1);
+ _surface->create(kScreenWidth, kScreenHeight, 1);
this->clearScreen();
_palette = new byte[4 * kNumColours];
setPaletteEmpty();
@@ -81,8 +83,8 @@
void Screen::copyToScreen() const {
byte *ptr = (byte *)_surface->getBasePtr(0, 0);
- _vm->_system->copyRectToScreen(ptr, _vm->_screenWidth, 0, 0,
- _vm->_screenWidth, _vm->_screenHeight);
+ _vm->_system->copyRectToScreen(ptr, kScreenWidth, 0, 0,
+ kScreenWidth, kScreenHeight);
_vm->_system->updateScreen();
}
@@ -91,7 +93,7 @@
void Screen::clearScreen() const {
byte *ptr = (byte *)_surface->getBasePtr(0, 0);
- memset(ptr, 0, _vm->_screenWidth * _vm->_screenHeight);
+ memset(ptr, 0, kScreenWidth * kScreenHeight);
}
void Screen::drawSprite(const Sprite &s) const {
@@ -110,7 +112,7 @@
void Screen::fillScreen(uint16 colour) const {
byte *ptr = (byte *)_surface->getBasePtr(0, 0);
- memset(ptr, colour, _vm->_screenWidth * _vm->_screenHeight);
+ memset(ptr, colour, kScreenWidth * kScreenHeight);
}
byte *Screen::getPalette() const {
Modified: scummvm/branches/gsoc2009-draci/engines/draci/screen.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/screen.h 2009-06-17 23:36:00 UTC (rev 41619)
+++ scummvm/branches/gsoc2009-draci/engines/draci/screen.h 2009-06-18 00:33:16 UTC (rev 41620)
@@ -32,6 +32,8 @@
namespace Draci {
+extern const int kScreenHeight;
+extern const int kScreenWidth;
extern const uint16 kNumColours;
class DraciEngine;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list