From 3fde0e7edf310245e5658b767840e742c9341597 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Thu, 10 Sep 2015 11:30:41 -0400 Subject: yeah --- .gitignore | 6 +- Makefile | 24 +- README.md | 6 +- doc/Quest.htm | 128 +- include/Quest.h | 58 +- include/SDL2/SDL.h | 326 +- include/SDL2/SDL_assert.h | 568 +- include/SDL2/SDL_atomic.h | 520 +- include/SDL2/SDL_audio.h | 1012 +- include/SDL2/SDL_bits.h | 194 +- include/SDL2/SDL_blendmode.h | 126 +- include/SDL2/SDL_clipboard.h | 142 +- include/SDL2/SDL_config.h | 420 +- include/SDL2/SDL_cpuinfo.h | 312 +- include/SDL2/SDL_endian.h | 478 +- include/SDL2/SDL_error.h | 152 +- include/SDL2/SDL_events.h | 1446 +-- include/SDL2/SDL_filesystem.h | 272 +- include/SDL2/SDL_gamecontroller.h | 632 +- include/SDL2/SDL_gesture.h | 174 +- include/SDL2/SDL_haptic.h | 2450 ++-- include/SDL2/SDL_hints.h | 1034 +- include/SDL2/SDL_image.h | 290 +- include/SDL2/SDL_joystick.h | 506 +- include/SDL2/SDL_keyboard.h | 434 +- include/SDL2/SDL_keycode.h | 682 +- include/SDL2/SDL_loadso.h | 162 +- include/SDL2/SDL_log.h | 422 +- include/SDL2/SDL_main.h | 310 +- include/SDL2/SDL_messagebox.h | 288 +- include/SDL2/SDL_mouse.h | 448 +- include/SDL2/SDL_mutex.h | 502 +- include/SDL2/SDL_name.h | 66 +- include/SDL2/SDL_opengl.h | 22252 ++++++++++++++++++------------------ include/SDL2/SDL_opengles.h | 76 +- include/SDL2/SDL_opengles2.h | 5580 ++++----- include/SDL2/SDL_pixels.h | 858 +- include/SDL2/SDL_platform.h | 328 +- include/SDL2/SDL_power.h | 150 +- include/SDL2/SDL_quit.h | 116 +- include/SDL2/SDL_rect.h | 276 +- include/SDL2/SDL_render.h | 1740 +-- include/SDL2/SDL_revision.h | 4 +- include/SDL2/SDL_rwops.h | 464 +- include/SDL2/SDL_scancode.h | 802 +- include/SDL2/SDL_shape.h | 286 +- include/SDL2/SDL_stdinc.h | 810 +- include/SDL2/SDL_surface.h | 1006 +- include/SDL2/SDL_system.h | 382 +- include/SDL2/SDL_syswm.h | 544 +- include/SDL2/SDL_test.h | 136 +- include/SDL2/SDL_test_assert.h | 210 +- include/SDL2/SDL_test_common.h | 376 +- include/SDL2/SDL_test_compare.h | 138 +- include/SDL2/SDL_test_crc32.h | 248 +- include/SDL2/SDL_test_font.h | 152 +- include/SDL2/SDL_test_fuzzer.h | 768 +- include/SDL2/SDL_test_harness.h | 246 +- include/SDL2/SDL_test_images.h | 156 +- include/SDL2/SDL_test_log.h | 134 +- include/SDL2/SDL_test_md5.h | 258 +- include/SDL2/SDL_test_random.h | 230 +- include/SDL2/SDL_thread.h | 574 +- include/SDL2/SDL_timer.h | 230 +- include/SDL2/SDL_touch.h | 172 +- include/SDL2/SDL_types.h | 58 +- include/SDL2/SDL_version.h | 324 +- include/SDL2/SDL_video.h | 1958 ++-- include/SDL2/begin_code.h | 280 +- include/SDL2/close_code.h | 74 +- include/SDL2/winapifamily.h | 176 +- include/UIClass.h | 22 +- include/World.h | 41 +- include/common.h | 57 +- lib/libSDL2.la | 82 +- lib/libSDL2_image.la | 82 +- lib/pkgconfig/SDL2_image.pc | 24 +- lib/pkgconfig/sdl2.pc | 30 +- src/Quest.cpp | 124 +- src/UIClass.cpp | 44 +- src/World.cpp | 88 +- src/main.cpp | 196 +- 82 files changed, 28992 insertions(+), 28960 deletions(-) diff --git a/.gitignore b/.gitignore index 99038b3..0193326 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -main.exe -main -game.odt +main.exe +main +game.odt diff --git a/Makefile b/Makefile index 5398f5f..d260819 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -FLAGS_LINUX = -lGL -lSDL2_image -FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image -FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2 - -all: - @g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS) - -win32: - @g++ -L lib/ src/*.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS) - -clean: - rm main* +FLAGS_LINUX = -lGL -lSDL2_image +FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image +FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2 + +all: + @g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS) + +win32: + @g++ -L lib/ src/*.cpp -o main.exe $(FLAGS_WIN32) $(FLAGS) + +clean: + rm main* diff --git a/README.md b/README.md index 2f2bc35..d4e4273 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# gamedev - -gamedev is a high school project between drumsetmonkey and tcsullivan written in C++ and using SDL2/OpenGL. The goal of this project is to have a completed commercial-grade video game available to Windows and Linux users. The game is planned to have a price, and once the game reaches its final stages it will become closed source (however, what was uploaded will stay for others to use as a resource). +# gamedev + +gamedev is a high school project between drumsetmonkey and tcsullivan written in C++ and using SDL2/OpenGL. The goal of this project is to have a completed commercial-grade video game available to Windows and Linux users. The game is planned to have a price, and once the game reaches its final stages it will become closed source (however, what was uploaded will stay for others to use as a resource). diff --git a/doc/Quest.htm b/doc/Quest.htm index 0f2f822..5492f16 100644 --- a/doc/Quest.htm +++ b/doc/Quest.htm @@ -1,64 +1,64 @@ - - - - Quest - - - -

Quest

-
-

Description

-

Quest.h provides quest functionality, including the master list of quests and methods for the player to access them.

-
-

Macros

-
#define QUEST_LIMIT 5
- #define TOTAL_QUESTS 1 -
- -

class Quest

-
public:
- char *title,*desc;
- unsigned int xp;
- Quest();
- Quest(const char *t,const char *d,unsigned int x);
- ~Quest(); -
- -

class QuestHandler

-
private:
- unsigned char ccnt;
- Quest *current[QUEST_LIMIT];
-public:
- QuestHandler();
- int assign(const char *t);
- int drop(const char *t);
- int finish(const char *t);
-
-