diff --git a/editor/base_scene.cpp b/editor/base_scene.cpp deleted file mode 100644 index 19753a0..0000000 --- a/editor/base_scene.cpp +++ /dev/null @@ -1,139 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "base_scene.hpp" - -#include - -//------------------------- -//Static declarations -//------------------------- - -SDL_Surface* BaseScene::screen = nullptr; - -//------------------------- -//Public access members -//------------------------- - -BaseScene::BaseScene() { - // -} - -BaseScene::~BaseScene() { - // -} - -//------------------------- -//Program control -//------------------------- - -SDL_Surface* BaseScene::SetScreen(int w, int h, int bpp, Uint32 flags) { - if (!bpp) { - bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel; - } - - screen = SDL_SetVideoMode(w, h, bpp, flags); - - if (!screen) { - throw(std::runtime_error("Failed to create the screen surface")); - } - - return screen; -} - -SDL_Surface* BaseScene::GetScreen() { - return screen; -} - -SceneList BaseScene::SetNextScene(SceneList sceneIndex) { - return nextScene = sceneIndex; -} - -SceneList BaseScene::GetNextScene() const { - return nextScene; -} - -//------------------------- -//Frame loop -//------------------------- - -void BaseScene::RunFrame(double delta) { - FrameStart(); - HandleEvents(); - Update(delta); - FrameEnd(); -} - -void BaseScene::RenderFrame() { - SDL_FillRect(screen, 0, 0); - Render(screen); - SDL_Flip(screen); -} - -//------------------------- -//Event handlers -//------------------------- - -void BaseScene::HandleEvents() { - SDL_Event event; - - while(SDL_PollEvent(&event)) { - switch(event.type) { - case SDL_QUIT: - QuitEvent(); - break; - - case SDL_VIDEORESIZE: - SetScreen(event.resize.w, event.resize.h, 0, screen->flags); - break; - - case SDL_MOUSEMOTION: - MouseMotion(event.motion); - break; - - case SDL_MOUSEBUTTONDOWN: - MouseButtonDown(event.button); - break; - - case SDL_MOUSEBUTTONUP: - MouseButtonUp(event.button); - break; - - case SDL_KEYDOWN: - KeyDown(event.key); - break; - - case SDL_KEYUP: - KeyUp(event.key); - break; - -#ifdef USE_EVENT_JOYSTICK - //TODO: joystick/gamepad support -#endif - -#ifdef USE_EVENT_UNKNOWN - default: - UnknownEvent(event); - break; -#endif - }//switch - }//while -} diff --git a/editor/base_scene.hpp b/editor/base_scene.hpp deleted file mode 100644 index 44dfab8..0000000 --- a/editor/base_scene.hpp +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef BASESCENE_HPP_ -#define BASESCENE_HPP_ - -#include "scene_list.hpp" - -#include "SDL/SDL.h" - -class BaseScene { -public: - //Public access members - BaseScene(); - virtual ~BaseScene(); - - //Program control - static SDL_Surface* SetScreen(int w, int h, int bpp = 0, Uint32 flags = SDL_HWSURFACE|SDL_DOUBLEBUF); - static SDL_Surface* GetScreen(); - - SceneList SetNextScene(SceneList sceneIndex); - SceneList GetNextScene() const; - - //Frame loop - virtual void RunFrame(double delta); - virtual void RenderFrame(); - -protected: - virtual void FrameStart() {} - virtual void HandleEvents(); - virtual void Update(double delta) {} - virtual void FrameEnd() {} - virtual void Render(SDL_Surface* const screen) {} - - //Event handlers - virtual void QuitEvent() { SetNextScene(SceneList::QUIT); } - virtual void MouseMotion(SDL_MouseMotionEvent const&) {} - virtual void MouseButtonDown(SDL_MouseButtonEvent const&) {} - virtual void MouseButtonUp(SDL_MouseButtonEvent const&) {} - virtual void KeyDown(SDL_KeyboardEvent const&) {} - virtual void KeyUp(SDL_KeyboardEvent const&) {} - -#ifdef USE_EVENT_JOYSTICK - //TODO: joystick/gamepad support -#endif - -#ifdef USE_EVENT_UNKNOWN - virtual void UnknownEvent(SDL_Event const&) {} -#endif - -private: - static SDL_Surface* screen; - SceneList nextScene = SceneList::CONTINUE; -}; - -#endif diff --git a/editor/editor_application.cpp b/editor/editor_application.cpp deleted file mode 100644 index 12aa335..0000000 --- a/editor/editor_application.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial EditorApplications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "editor_application.hpp" - -#include -#include - -//------------------------- -//Scene headers -//------------------------- - -//Add the custom scene headers here -#include "editor_scene.hpp" -#include "testificate_scene.hpp" - -//------------------------- -//Public access members -//------------------------- - -void EditorApplication::Init(int argc, char** argv) { - config.Load("rsc\\config.cfg"); - if (SDL_Init(SDL_INIT_VIDEO)) - throw(std::runtime_error("Failed to initialize SDL")); - - BaseScene::SetScreen(config.Int("screen.w"), config.Int("screen.h")); -} - -void EditorApplication::Proc() { - LoadScene(SceneList::FIRST); - - //prepare the time system - typedef std::chrono::steady_clock Clock; - - Clock::duration delta(16 * Clock::duration::period::den / std::milli::den); - Clock::time_point simTime = Clock::now(); - Clock::time_point realTime; - - //The main loop - while(activeScene->GetNextScene() != SceneList::QUIT) { - //switch scenes when necessary - if (activeScene->GetNextScene() != SceneList::CONTINUE) { - LoadScene(activeScene->GetNextScene()); - continue; - } - - //update the current time - realTime = Clock::now(); - - //simulate game time - while (simTime < realTime) { - //call each user defined function - activeScene->RunFrame(double(delta.count()) / Clock::duration::period::den); - simTime += delta; - } - - //draw the game to the screen - activeScene->RenderFrame(); - - //give the computer a break - SDL_Delay(10); - } - - UnloadScene(); -} - -void EditorApplication::Quit() { - SDL_Quit(); -} - -//------------------------- -//Private access members -//------------------------- - -void EditorApplication::LoadScene(SceneList sceneIndex) { - UnloadScene(); - - switch(sceneIndex) { - //add scene creation calls here - case SceneList::FIRST: - case SceneList::EDITORSCENE: - activeScene = new EditorScene(&config); - break; - - case SceneList::TESTIFICATESCENE: - activeScene = new TestificateScene(&config); - break; - - - default: - throw(std::logic_error("Failed to recognize the scene index")); - } -} - -void EditorApplication::UnloadScene() { - delete activeScene; - activeScene = nullptr; -} diff --git a/editor/editor_application.hpp b/editor/editor_application.hpp deleted file mode 100644 index 89aac86..0000000 --- a/editor/editor_application.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef EDITORAPPLICATION_HPP_ -#define EDITORAPPLICATION_HPP_ - -#include "scene_list.hpp" -#include "base_scene.hpp" -#include "config_utility.hpp" - -class EditorApplication { -public: - EditorApplication() = default; - ~EditorApplication() = default; - - void Init(int argc, char** argv); - void Proc(); - void Quit(); - -private: - //Private access members - void LoadScene(SceneList sceneIndex); - void UnloadScene(); - - //globals - ConfigUtility config; - - BaseScene* activeScene = nullptr; -}; - -#endif diff --git a/editor/editor_scene.cpp b/editor/editor_scene.cpp deleted file mode 100644 index 94706bd..0000000 --- a/editor/editor_scene.cpp +++ /dev/null @@ -1,216 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013, 2014 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "editor_scene.hpp" - -#include "utility.hpp" - -#include -#include -#include - -using namespace std; - -//------------------------- -//Public access members -//------------------------- - -EditorScene::EditorScene(ConfigUtility* const arg1): - config(*arg1) -{ - //create the debugging "window" - debugInfo.CreateSurface(256, 256); - - //setup the utility objects - font.LoadSurface(config["dir.fonts"] + "pk_white_8.bmp"); - - buttonImage.LoadSurface(config["dir.interface"] + "button_menu.bmp"); - buttonImage.SetClipH(buttonImage.GetClipH()/3); - - //setup the menu bar - menuBar.SetFont(&font); - menuBar.SetImage(&buttonImage); - - menuBar.SetEntries({ - {"File", "New", "Open", "Save", "Close"}, - {"Edit", "Set Tile", "Set Brush", "Script"}, - {"Debug", "Debug On", "Debug Off", "Toggle", "Testificate"} - }); - - //debug - tsheet.Load(config["dir.tilesets"] + "terrain.bmp", 12, 15); - for (int i = 0; i < REGION_WIDTH; i++) { - for (int j = 0; j < REGION_HEIGHT; j++) { - pager.SetTile(i, j, 0, 14); - } - } - pager.SetTile(5, 10, 1, 48); -} - -EditorScene::~EditorScene() { - // -} - -//------------------------- -//Frame loop -//------------------------- - -void EditorScene::FrameStart() { - // -} - -void EditorScene::Update(double delta) { - // -} - -void EditorScene::FrameEnd() { - // -} - -void EditorScene::Render(SDL_Surface* const screen) { - tsheet.DrawRegionTo(screen, pager.GetRegion(0, 0), camera.x, camera.y); - - //draw a big bar across the top (hackish) - buttonImage.SetClipY(0); - for (int i = 0; i < screen->w; i += buttonImage.GetClipW()) { - buttonImage.DrawTo(screen, i, 0); - } - - //draw the menu bar - menuBar.DrawTo(screen); - - //draw some debugging info - if (debugOpen) { - SDL_FillRect(debugInfo.GetSurface(), 0, 0); - DrawToDebugInfo(string("camera.x: ") + to_string_custom(camera.x), 0); - DrawToDebugInfo(string("camera.y: ") + to_string_custom(camera.y), 1); - debugInfo.DrawTo(screen, screen->w - debugInfo.GetClipW(), buttonImage.GetClipH()); - } -} - -void EditorScene::DrawToDebugInfo(std::string str, int line) { - //draw the debug info on the right, with a grey background - SDL_Rect clip = { - Sint16(debugInfo.GetClipW() - str.size() * font.GetCharW()), - Sint16(font.GetCharH() * line), - Uint16(str.size() * font.GetCharW()), - Uint16(font.GetCharH()) - }; - SDL_FillRect(debugInfo.GetSurface(), &clip, SDL_MapRGB(debugInfo.GetSurface()->format, 64, 64, 64)); - font.DrawStringTo(str, debugInfo.GetSurface(), clip.x, clip.y); -} - -//------------------------- -//Event handlers -//------------------------- - -void EditorScene::MouseMotion(SDL_MouseMotionEvent const& motion) { - menuBar.MouseMotion(motion); - - if (motion.state & SDL_BUTTON_RMASK) { - camera.x -= motion.xrel; - camera.y -= motion.yrel; - } -} - -void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) { - menuBar.MouseButtonDown(button); -} - -void EditorScene::MouseButtonUp(SDL_MouseButtonEvent const& button) { - int entry, drop; - menuBar.MouseButtonUp(button, &entry, &drop); - HandleMenuOption(entry, drop); -} - -void EditorScene::KeyDown(SDL_KeyboardEvent const& key) { - switch(key.keysym.sym) { - case SDLK_ESCAPE: - QuitEvent(); - break; - case SDLK_SPACE: - camera.x = 0; - camera.y = 0; - break; - case SDLK_TAB: - debugOpen = !debugOpen; - break; - } -} - -void EditorScene::KeyUp(SDL_KeyboardEvent const& key) { - // -} - -//------------------------- -//Members -//------------------------- - -void EditorScene::HandleMenuOption(int entry, int drop) { - //manage input from the menu bar - switch(entry) { - case 0: //File - switch(drop) { - case 0: - //NEW - break; - case 1: - //OPEN - break; - case 2: - //SAVE - break; - case 3: - //CLOSE - break; - } - break; - case 1: //Edit - switch(drop) { - case 0: - //SET TILE - break; - case 1: - //SET BRUSH - break; - case 2: - //SCRIPT - break; - } - break; - case 2: //Debug - switch(drop) { - case 0: - debugOpen = true; - break; - case 1: - debugOpen = false; - break; - case 2: - debugOpen = !debugOpen; - break; - case 3: - SetNextScene(SceneList::TESTIFICATESCENE); - break; - } - break; - } -} \ No newline at end of file diff --git a/editor/editor_scene.hpp b/editor/editor_scene.hpp deleted file mode 100644 index 0ba8734..0000000 --- a/editor/editor_scene.hpp +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013, 2014 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef EDITORSCENE_HPP_ -#define EDITORSCENE_HPP_ - -#include "base_scene.hpp" - -#include "config_utility.hpp" -#include "image.hpp" -#include "raster_font.hpp" -#include "menu_bar.hpp" - -#include "region_pager.hpp" -#include "map_allocator.hpp" -#include "map_file_format.hpp" -#include "tile_sheet.hpp" - -class EditorScene : public BaseScene { -public: - //Public access members - EditorScene(ConfigUtility* const); - ~EditorScene(); - -protected: - //Frame loop - void FrameStart(); - void Update(double delta); - void FrameEnd(); - void Render(SDL_Surface* const); - - //Event handlers - void MouseMotion(SDL_MouseMotionEvent const&); - void MouseButtonDown(SDL_MouseButtonEvent const&); - void MouseButtonUp(SDL_MouseButtonEvent const&); - void KeyDown(SDL_KeyboardEvent const&); - void KeyUp(SDL_KeyboardEvent const&); - - //members - void HandleMenuOption(int entry, int drop); - - //globals - ConfigUtility& config; - - //debugging tools - void DrawToDebugInfo(std::string, int line); - Image debugInfo; - bool debugOpen = true; - - RasterFont font; - Image buttonImage; - MenuBar menuBar; - - struct { - int x = 0, y = 0; - } camera; - - RegionPager pager; - TileSheet tsheet; -}; - -#endif diff --git a/editor/main.cpp b/editor/main.cpp deleted file mode 100644 index 3b09845..0000000 --- a/editor/main.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "editor_application.hpp" - -#include -#include - -using namespace std; - -int main(int argc, char** argv) { - cout << "Beginning editor" << endl; - try { - EditorApplication app; - app.Init(argc, argv); - app.Proc(); - app.Quit(); - } - catch(exception& e) { - cerr << "Fatal exception thrown: " << e.what() << endl; - return 1; - } - cout << "Clean exit" << endl; - return 0; -} \ No newline at end of file diff --git a/editor/makefile b/editor/makefile deleted file mode 100644 index f785faa..0000000 --- a/editor/makefile +++ /dev/null @@ -1,43 +0,0 @@ -#config -INCLUDES+=../common ../common/graphics ../common/map ../common/ui -LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL -llua -CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES)) -CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES)) - -#source -CXXSRC=$(wildcard *.cpp) -CSRC=$(wildcard *.c) - -#objects -OBJDIR=obj -OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) -OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o)) - -#output -OUTDIR=../out -OUT=$(addprefix $(OUTDIR)/,editor) - -#targets -all: $(OBJ) $(OUT) - $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) - -$(OBJ): | $(OBJDIR) - -$(OUT): | $(OUTDIR) - -$(OBJDIR): - mkdir $(OBJDIR) - -$(OUTDIR): - mkdir $(OUTDIR) - -$(OBJDIR)/%.o: %.cpp - $(CXX) $(CXXFLAGS) -c -o $@ $< - -$(OBJDIR)/%.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< - -clean: - $(RM) *.o *.a *.exe - -rebuild: clean all diff --git a/editor/scene_list.hpp b/editor/scene_list.hpp deleted file mode 100644 index eb48ab1..0000000 --- a/editor/scene_list.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef SCENELIST_HPP_ -#define SCENELIST_HPP_ - -enum class SceneList { - //these are reserved - QUIT, - CONTINUE, - FIRST, - - //custom indexes - TESTIFICATESCENE, - EDITORSCENE, -}; - -#endif diff --git a/editor/testificate_scene.cpp b/editor/testificate_scene.cpp deleted file mode 100644 index 9f451f2..0000000 --- a/editor/testificate_scene.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#include "testificate_scene.hpp" - -#include - -using std::cout; -using std::endl; - -//------------------------- -//Public access members -//------------------------- - -TestificateScene::TestificateScene(ConfigUtility* const arg1): - config(*arg1) -{ - // -} - -TestificateScene::~TestificateScene() { - // -} - -//------------------------- -//Frame loop -//------------------------- - -void TestificateScene::FrameStart() { - // -} - -void TestificateScene::Update(double delta) { - // -} - -void TestificateScene::FrameEnd() { - // -} - -void TestificateScene::Render(SDL_Surface* const screen) { - // -} - -//------------------------- -//Event handlers -//------------------------- - -void TestificateScene::MouseMotion(SDL_MouseMotionEvent const& motion) { - // -} - - -void TestificateScene::MouseButtonDown(SDL_MouseButtonEvent const& button) { - // -} - -void TestificateScene::MouseButtonUp(SDL_MouseButtonEvent const& button) { - // -} - -void TestificateScene::KeyDown(SDL_KeyboardEvent const& key) { - switch(key.keysym.sym) { - case SDLK_ESCAPE: -// QuitEvent(); - SetNextScene(SceneList::EDITORSCENE); - break; - } -} - -void TestificateScene::KeyUp(SDL_KeyboardEvent const& key) { - // -} diff --git a/editor/testificate_scene.hpp b/editor/testificate_scene.hpp deleted file mode 100644 index dd0a76b..0000000 --- a/editor/testificate_scene.hpp +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright: (c) Kayne Ruse 2013 - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * - * 3. This notice may not be removed or altered from any source - * distribution. -*/ -#ifndef TESTIFICATESCENE_HPP_ -#define TESTIFICATESCENE_HPP_ - -#include "base_scene.hpp" - -#include "config_utility.hpp" - -class TestificateScene : public BaseScene { -public: - //Public access members - TestificateScene(ConfigUtility* const); - ~TestificateScene(); - -protected: - //Frame loop - void FrameStart(); - void Update(double delta); - void FrameEnd(); - void Render(SDL_Surface* const); - - //Event handlers - void MouseMotion(SDL_MouseMotionEvent const&); - void MouseButtonDown(SDL_MouseButtonEvent const&); - void MouseButtonUp(SDL_MouseButtonEvent const&); - void KeyDown(SDL_KeyboardEvent const&); - void KeyUp(SDL_KeyboardEvent const&); - - //globals - ConfigUtility& config; -}; - -#endif diff --git a/makefile b/makefile index cff7d4f..3315bc2 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,6 @@ all: $(OUTDIR) $(MAKE) -C common $(MAKE) -C server $(MAKE) -C client - $(MAKE) -C editor $(OUTDIR): mkdir $(OUTDIR) diff --git a/rsc/scripts/setup_server.lua b/rsc/scripts/setup_server.lua index cee0e03..16b7627 100644 --- a/rsc/scripts/setup_server.lua +++ b/rsc/scripts/setup_server.lua @@ -25,8 +25,3 @@ end function map.save(region, dir) -- end - ---debugging -print("DEBUG: Initial tile value: ", map.gettile(0, 0, 0)) -map.settile(0, 0, 0, 86) -map.settile(10, 10, 1, 156) diff --git a/todo.txt b/todo.txt deleted file mode 100644 index c392799..0000000 --- a/todo.txt +++ /dev/null @@ -1,30 +0,0 @@ -I need to keep the documentation up to date. Namey, the GDD is getting out of date. - ---Naming conventions-- - -I need to define the differences between several different terms i.e. naming conventions. -I may also need to rewrite some variable names. - -* User: This is the individual who is playing the game -* Player: A synonym for a user -* Character: This is the actual player character in the game -* Username: This is the name of the player; ususally kept private -* Handle: This is the name of a character -* Avatar: This is the name of the sprite used by a character - ---ServerApplication's methods-- - -These interact with the database file, making the server a persistent system. - -* CreateUserAccount -* LoadUserAccount -* SaveUserAccount -* UnloadUserAccount -* DeleteUserAccount - -* CreateCharacter -* LoadCharacter -* SaveCharacter -* UnloadCharacter -* DeleteCharacter -