Lazily committing the entire splice at once (read more)

(this message is copied from my blog)

So I took the lazy route and just committed the entire splice between the jam branch and the development branch all at once. It is exactly as terrible as you think it is, but I've been out of coding for 2 weeks, and I want to get some shit done. I'll pick through each piece one by one, by comparing the diffs from the develop branch to the current jam-merge branch.

Those developers I met on Monday said they were impressed by my ability to manage a large codebase, but if they saw this I'd expect they'd probably take that back.

And oh god it's been 3 weeks since I touched the main branch WTF?

client/character.hpp

@@ -25,7 +25,7 @@
 //components
 #include "character_defines.hpp"
 #include "vector2.hpp"
-#include "statistics.hpp"
+#include "bounding_box.hpp"
 
 //graphics
 #include "sprite_sheet.hpp"
@@ -46,9 +46,6 @@ public:
 	void CorrectSprite();
 	SpriteSheet* GetSprite() { return &sprite; }
 
-	//gameplay
-	Statistics* GetStats() { return &stats; }
-
 	//accessors and mutators
 
 	//metadata
@@ -64,18 +61,13 @@ public:
 	Vector2 GetOrigin() const { return origin; }
 	Vector2 SetMotion(Vector2 v) { return motion = v; }
 	Vector2 GetMotion() const { return motion; }
-	Vector2 SetBounds(Vector2 v) { return bounds = v; }
-	Vector2 GetBounds() const { return bounds; }
+	BoundingBox SetBoundingBox(BoundingBox b) { return bounds = b; }
+	BoundingBox GetBoundingBox() const { return bounds; }
 
 private:
 	//graphics
 	SpriteSheet sprite;
 
-	//base statistics
-	Statistics stats;
-
-	//TODO: gameplay components: equipment, items, buffs, debuffs
-
 	//metadata
 	int owner;
 	std::string handle;
@@ -84,7 +76,7 @@ private:
 	//position
 	Vector2 origin = {0.0,0.0};
 	Vector2 motion = {0.0,0.0};
-	Vector2 bounds = {CHARACTER_BOUNDS_WIDTH,CHARACTER_BOUNDS_HEIGHT};
+	BoundingBox bounds;
 };
 
 //tmp