Ticket #8493: lure-update1.patch

anim.cpp

@@ -136 +136 @@
         return true;
 }
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

anim.h

@@ -32 +32 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

decode.cpp

@@ -130 +130 @@
         return dest;
 }
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

decode.h

@@ -33 +33 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

disk.cpp

@@ -143 +143 @@
         return &_entries[entryIndex];
 }
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

disk.h

@@ -50 +50 @@
 
 } // end of namespace Lure
 
-#endif
- No newline at end of file
+#endif

events.cpp

@@ -48 +48 @@
         case OSystem::EVENT_RBUTTONUP:
                 _rButton = false;
                 break;
+        case OSystem::EVENT_KEYDOWN:
+        case OSystem::EVENT_KEYUP:
+        case OSystem::EVENT_MOUSEMOVE:
+        case OSystem::EVENT_WHEELUP:
+        case OSystem::EVENT_WHEELDOWN:
+        case OSystem::EVENT_SCREEN_CHANGED:
+                break;
+        case OSystem::EVENT_QUIT:
+                _system.quit();
+                break;
         }
 }
 
@@ -65 +75 @@
 void Mouse::setCursorNum(uint8 cursorNum)
 {
         _cursorNum = cursorNum;
-        int x = 7, y = 7;
-        if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) 
-        {
-                x = 0; y = 0;
+        int x1 = 7, y1 = 7;
+        if ((cursorNum == CURSOR_ARROW) || (cursorNum == CURSOR_MENUBAR)) {
+                x1 = 0;
+                y1 = 0;
         }
 
         byte *cursorAddr = _cursors->data() + (cursorNum * CURSOR_SIZE);
-        _system.setMouseCursor(cursorAddr, CURSOR_WIDTH, CURSOR_HEIGHT, x, y, 0);
+        _system.setMouseCursor(cursorAddr, CURSOR_WIDTH, CURSOR_HEIGHT, x1, y1, 0);
 }
 
 void Mouse::setCursorNum(uint8 cursorNum, int hotspotX, int hotspotY)
@@ -82 +92 @@
         _system.setMouseCursor(cursorAddr, CURSOR_WIDTH, CURSOR_HEIGHT, hotspotX, hotspotY, 0);
 }
 
-void Mouse::setPosition(int x, int y)
+void Mouse::setPosition(int x1, int y1)
 {
-        _system.warpMouse(x, y);
+        _system.warpMouse(x1, y1);
 }
 
 /*--------------------------------------------------------------------------*/
@@ -121 +131 @@
         case OSystem::EVENT_WHEELUP:
         case OSystem::EVENT_WHEELDOWN:
                 _mouse.handleEvent(_event);
+                break;
+
+        case OSystem::EVENT_KEYDOWN:
+        case OSystem::EVENT_KEYUP:
+        case OSystem::EVENT_SCREEN_CHANGED:
                 break;
         }
 

events.h

@@ -53 +53 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

game.cpp

@@ -141 +141 @@
 void Game::doTextSpeed()
 {
         slowSpeedFlag = !slowSpeedFlag;
-        char *pSrc = slowSpeedFlag ? "Slow" : "Fast";
+        const char *pSrc = slowSpeedFlag ? "Slow" : "Fast";
         char *pDest = _menu.getMenu(2).getEntry(1);
         memcpy(pDest, pSrc, 4);
 }
@@ -149 +149 @@
 void Game::doSound()
 {
         soundFlag = !soundFlag;
-        char *pSrc = soundFlag ? "on " : "off";
+        const char *pSrc = soundFlag ? "on " : "off";
         char *pDest = _menu.getMenu(2).getEntry(2) + 6;
         memcpy(pDest, pSrc, 3);
 }
 
 
-}
- No newline at end of file
+}

intro.cpp

@@ -15 +15 @@
 static const uint16 start_screens[] = {0x18, 0x1A, 0x1E, 0x1C, 0};
 static const AnimRecord anim_screens[] = {{0x40, 0, true, true}, {0x42, 1, false, true}, 
         {0x44, 2, false, false}, {0x24, 3, false, true}, {0x46, 3, false, false}, 
-        {0}};
+        {0, 0, false, false}};
 
 // showScreen
 // Shows a screen by loading it from the given resource, and then fading it in
@@ -89 +89 @@
 
                 result = false;
                 switch (anim->show()) {
-                        case ABORT_NONE:
-                                if (curr_anim->endingPause) {
-                                        result = delay(12000);
-                                }
-                                break;
-                        case ABORT_END_INTRO:
-                                result = true;
-                                break;
+                case ABORT_NONE:
+                        if (curr_anim->endingPause) {
+                                result = delay(12000);
+                        }
+                        break;
+
+                case ABORT_END_INTRO:
+                        result = true;
+                        break;
+
+                case ABORT_NEXT_SCENE:
+                        break;
                 }
                 delete anim;
 
@@ -123 +127 @@
         return false;
 }
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

intro.h

@@ -24 +24 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

lure.cpp

@@ -126 +126 @@
         return new LureEngine(detector, system);
 }
 
-REGISTER_PLUGIN(LURE, "Lure of the Temptress Engine");
+REGISTER_PLUGIN(LURE, "Lure of the Temptress Engine")
 
 namespace Lure {
 
@@ -143 +143 @@
 
         _features = 0;
         _game = 0;
+}
 
+void LureEngine::detectGame() {
         // Make sure all the needed files are present
         for (uint8 fileNum=0; fileNum<5; ++fileNum)
         {
@@ -159 +161 @@
                                 error("Missing disk%d.vga", fileNum);
                 }
         }
-        
 
         uint8 md5sum[16];
         char md5str[32 + 1];
         const LureGameSettings *g;
         bool found = false;
 
+        *md5str = 0;
+
         for (g = lure_games; g->name; g++) {
                 if (!Common::File::exists(g->checkFile))
                         continue;
@@ -216 +219 @@
                 driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
         }
 
+        detectGame();
+
         _disk = new Disk(_gameDataPath);
         _screen = new Screen(*_system);
         _mouse = new Mouse(*_system);
@@ -246 +251 @@
         if (!_events->quitFlag) 
         {
                 // Play the game
-                Game game(*_system);
-                game.execute();
+                Game game1(*_system);
+                game1.execute();
         }
 
         quitGame();

lure.h

@@ -39 +39 @@
         uint32 features() { return _features; }
         uint8 game() { return _game; }
         Disk &disk() { return *_disk; }
+
+private:
+        void detectGame();
 };
 
 } // End of namespace Lure

memory.cpp

@@ -29 +29 @@
 
 /*--------------------------------------------------------------------------*/
 
-MemoryBlock::MemoryBlock(uint32 size)
+MemoryBlock::MemoryBlock(uint32 size1)
 {
-        _data = (uint8 *) malloc(size);
+        _data = (uint8 *) malloc(size1);
         if (!_data) error ("Failed allocating memory block");
-        _size = size;
+        _size = size1;
 }
 
 MemoryBlock::MemoryBlock(MemoryBlock *src)
@@ -82 +82 @@
         memcpy(pDest, pSrc, srcLen);
 }
 
-void MemoryBlock::reallocate(uint32 size)
+void MemoryBlock::reallocate(uint32 size1)
 {
-        _size = size;
-        _data = (byte *) realloc(_data, size);
+        _size = size1;
+        _data = (byte *) realloc(_data, size1);
         if (!_data) error ("Failed reallocating memory block");
 }
 
 void MemoryBlock::saveToFile(const Common::String &filename)
 {
         Common::File *f = new Common::File();
-        f->open(filename.c_str(), Common::File::AccessMode::kFileWriteMode);
+        f->open(filename.c_str(), Common::File::kFileWriteMode);
         f->write(_data, _size);
         f->close();
         delete f;
 }
 
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

memory.h

@@ -39 +39 @@
 
 } // end of namspace Lure
 
-#endif
- No newline at end of file
+#endif

menu.cpp

@@ -5 +5 @@
 namespace Lure 
 {
 
-MenuRecord::MenuRecord(uint16 hsxstart, uint16 hsxend, uint16 xstart, uint16 width, char *strings)
+MenuRecord::MenuRecord(uint16 hsxstrt, uint16 hsxnd, uint16 xstrt, uint16 wdth, char *strings)
 {
-        _xstart = xstart; _width = width;
-        _hsxstart = hsxstart; _hsxend = hsxend;
+        _xstart = xstrt; _width = wdth;
+        _hsxstart = hsxstrt; _hsxend = hsxnd;
 
         // Figure out the number of entries
         char *s = strings;

menu.h

@@ -60 +60 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

module.mk

@@ +1 @@
+MODULE := lure
+
+MODULE_OBJS := \
+        lure/anim.o \
+        lure/decode.o \
+        lure/disk.o \
+        lure/events.o \
+        lure/game.o \
+        lure/intro.o \
+        lure/lure.o \
+        lure/memory.o \
+        lure/menu.o \
+        lure/palette.o \
+        lure/screen.o \
+        lure/surface.o
+
+MODULE_DIRS += \
+        lure
+
+# This module can be built as a plugin
+ifdef BUILD_PLUGINS
+PLUGIN := 1
+endif
+
+# Include common rules 
+include $(srcdir)/common.rules

palette.cpp

@@ -20 +20 @@
 // Consructor
 // Sets up a palette with the given number of entries and a copy of the passed data
 
-Palette::Palette(uint8 numEntries, const byte *data, PaletteSource paletteSource)
+Palette::Palette(uint8 numEntries1, const byte *data1, PaletteSource paletteSource)
 {
-        _numEntries = numEntries;
+        _numEntries = numEntries1;
         _palette = Memory::allocate(_numEntries * 4);
 
-        if (data)
+        if (data1)
         {
                 if (paletteSource == RGB64) 
-                        convertPalette(data, _numEntries);
+                        convertPalette(data1, _numEntries);
                 else
-                        _palette->copyFrom(data, 0, 0, _numEntries*4);
+                        _palette->copyFrom(data1, 0, 0, _numEntries*4);
         }
 
         // If no data provided, set a null palette
-        if (!data) _palette->empty();
+        if (!data1) _palette->empty();
 }
 
 // Constructor
@@ -63 +63 @@
         delete srcData;
 }
 
-void Palette::convertPalette(const byte *palette, uint16 numEntries)
+void Palette::convertPalette(const byte *palette1, uint16 numEntries1)
 {
         byte *pDest = _palette->data();
-        const byte *pSrc = palette;
+        const byte *pSrc = palette1;
 
-        while (numEntries-- > 0) {
+        while (numEntries1-- > 0) {
                 *pDest++ = (pSrc[0] << 2) + (pSrc[0] >> 4);
                 *pDest++ = (pSrc[1] << 2) + (pSrc[1] >> 4);
                 *pDest++ = (pSrc[2] << 2) + (pSrc[2] >> 4);
@@ -134 +134 @@
 }
 
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

palette.h

@@ -46 +46 @@
 
 } // end of namspace Lure
 
-#endif
- No newline at end of file
+#endif

screen.cpp

@@ -144 +144 @@
         _system.updateScreen();
 }
 
-} // end of namespace Lure
- No newline at end of file
+} // end of namespace Lure

screen.h

@@ -42 +42 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif

surface.cpp

@@ -24 +24 @@
 
 /*--------------------------------------------------------------------------*/
 
-Surface::Surface(MemoryBlock *src, uint16 width, uint16 height): _data(src), 
-                _width(width), _height(height)
+Surface::Surface(MemoryBlock *src, uint16 wdth, uint16 hght): _data(src), 
+                _width(wdth), _height(hght)
 {
-        if ((uint32) (width * height) != src->size())
+        if ((uint32) (wdth * hght) != src->size())
                 error("Surface dimensions do not match size of passed data");
 }
 
-Surface::Surface(uint16 width, uint16 height): _data(Memory::allocate(width*height)),
-        _width(width), _height(height)
+Surface::Surface(uint16 wdth, uint16 hght): _data(Memory::allocate(wdth*hght)),
+        _width(wdth), _height(hght)
 {
 }
 
@@ -53 +53 @@
         byte *pDest;
         uint8 charWidth = 0;
 
-        for (int y=0; y<8; ++y) 
+        for (int y1=0; y1<8; ++y1) 
         {
                 v = *pFont++;
-                pDest = addr + (y * _width);
+                pDest = addr + (y1 * _width);
 
-                for (int x=0; x<8; ++x, ++pDest)
+                for (int x1=0; x1<8; ++x1, ++pDest)
                 {
                         if (v & 0x80) {
                                 *pDest = colour;
-                                if (x+1 > charWidth) charWidth = x+1;
+                                if (x1+1 > charWidth) charWidth = x1+1;
                         }
                         else if (!transparent) *pDest = 0;
                         v = (v << 1) & 0xff;
@@ -77 +77 @@
                                                   uint8 colour, bool varLength)
 {
         const char *sPtr = line.c_str();
-        const byte *addr = _data->data() + (y * _width) + x;
+        //const byte *addr = _data->data() + (y * _width) + x;
         uint8 charWidth;
 
         while (*sPtr) 
@@ -213 +213 @@
 }
 
 
-}
- No newline at end of file
+}

surface.h

@@ -43 +43 @@
 
 } // End of namespace Lure
 
-#endif
- No newline at end of file
+#endif