diff options
| -rw-r--r-- | assets/playerk.png | bin | 375 -> 485 bytes | |||
| -rw-r--r-- | config/settings.xml | 2 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/entities.h | 6 | ||||
| -rw-r--r-- | main.cpp | 2 | ||||
| -rw-r--r-- | src/entities.cpp | 2 | ||||
| -rw-r--r-- | xcf/player.xcf | bin | 2457 -> 2495 bytes | |||
| -rw-r--r-- | xcf/playerJ.xcf | bin | 0 -> 1431 bytes | |||
| -rw-r--r-- | xcf/playerk.xcf | bin | 0 -> 2847 bytes | |||
| -rw-r--r-- | xml/playerSpawnHill1_Building1.xml | 9 | ||||
| -rw-r--r-- | xml/playerSpawnHill2.xml | 9 |
11 files changed, 7 insertions, 25 deletions
diff --git a/assets/playerk.png b/assets/playerk.png Binary files differindex be98f97..b514151 100644 --- a/assets/playerk.png +++ b/assets/playerk.png diff --git a/config/settings.xml b/config/settings.xml index c06089b..d981664 100644 --- a/config/settings.xml +++ b/config/settings.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <screen width="1280" height="720" /> -<hline value="3" /> +<hline value="3" />
\ No newline at end of file diff --git a/include/common.h b/include/common.h index 0df6533..4115f10 100644 --- a/include/common.h +++ b/include/common.h @@ -110,7 +110,7 @@ extern unsigned int SCREEN_HEIGHT; * */ -#define HLINE 3 +#define HLINE 4 /** * A 'wrapper' for libc's srand(), as we hope to eventually have our own random number diff --git a/include/entities.h b/include/entities.h index 9e8bece..ab33988 100644 --- a/include/entities.h +++ b/include/entities.h @@ -91,9 +91,9 @@ public: glEnable(GL_TEXTURE_2D); glColor3ub(255,255,255); glBegin(GL_QUADS); - glTexCoord2f(.25*index.x, .126*index.y); glVertex2i(loc.x, loc.y); - glTexCoord2f(.26*index.x, .126*index.y); glVertex2i(loc.x + width, loc.y); - glTexCoord2f(.26*index.x, .125*index.y); glVertex2i(loc.x + width, loc.y + height); + glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x, loc.y); + glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x + width, loc.y); + glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x + width, loc.y + height); glTexCoord2f(.25*index.x, .125*index.y); glVertex2i(loc.x, loc.y + width); glEnd(); glDisable(GL_TEXTURE_2D); @@ -951,7 +951,7 @@ void logic(){ HLINE*1.25, rand()%2 == 0?-(rand()%7)*.01:(rand()%7)*.01, ((4+rand()%6)*.05), - {0.0f,0.0f,255.0f}, + {0,0,255}, 2500); currentWorld->particles.back()->fountain = true; diff --git a/src/entities.cpp b/src/entities.cpp index 7e6b4e0..7f7d798 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -92,7 +92,7 @@ Player::Player(){ //sets all of the player specific traits on object creation subtype = 0; health = maxHealth = 100; speed = 1; - tex = new Texturec(3, "assets/player1.png", "assets/player.png", "assets/player2.png"); + tex = new Texturec(3, "assets/player1.png", "assets/playerk.png", "assets/player2.png"); //tex = new Texturec(3, "assets/maybeplayer.png", "assets/maybeplayer.png", "assets/maybeplayer.png"); inv = new Inventory(PLAYER_INV_SIZE); } diff --git a/xcf/player.xcf b/xcf/player.xcf Binary files differindex c99fb42..d8991a5 100644 --- a/xcf/player.xcf +++ b/xcf/player.xcf diff --git a/xcf/playerJ.xcf b/xcf/playerJ.xcf Binary files differnew file mode 100644 index 0000000..7f0cc59 --- /dev/null +++ b/xcf/playerJ.xcf diff --git a/xcf/playerk.xcf b/xcf/playerk.xcf Binary files differnew file mode 100644 index 0000000..ac97512 --- /dev/null +++ b/xcf/playerk.xcf diff --git a/xml/playerSpawnHill1_Building1.xml b/xml/playerSpawnHill1_Building1.xml deleted file mode 100644 index f33fcf5..0000000 --- a/xml/playerSpawnHill1_Building1.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<IndoorWorld> - <style background="1" bgm="assets/music/theme_jazz.wav" /> - <generation type="Random" width="300" /> - - <npc name="Bob" /> - -</IndoorWorld> - diff --git a/xml/playerSpawnHill2.xml b/xml/playerSpawnHill2.xml deleted file mode 100644 index d6a966f..0000000 --- a/xml/playerSpawnHill2.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<World> - <style background="0" bgm="assets/music/embark.wav" /> - <generation type="Random" width="500" /> - - <link left="playerSpawnHill1.xml" /> - -</World> - |
