Slight cleanup on recent pull req + changing versions up

zone/aggro.cpp

@@ -1422,15 +1422,13 @@ void Mob::RemoveFromFeignMemory(Client* attacker) {
 }
 
 void Mob::ClearFeignMemory() {
-    std::set<uint32>::iterator RememberedCharID;
-    RememberedCharID = feign_memory_list.begin();
-
+    std::set<uint32>::iterator RememberedCharID = feign_memory_list.begin();
     while (RememberedCharID != feign_memory_list.end()) 
     {
         Client* remember_client = entity_list.GetClientByCharID(*RememberedCharID);
         if(remember_client != NULL) //Still in zone
             remember_client->RemoveXTarget(this, false);
-        RememberedCharID++;
+        ++RememberedCharID;
     }
 
 	feign_memory_list.clear();

zone/command.cpp

@@ -943,7 +943,7 @@ void command_help(Client *c, const Seperator *sep)
 void command_version(Client *c, const Seperator *sep)
 {
 	c->Message(0, "Current version information.");
-	c->Message(0, "	%s", CURRENT_ZONE_VERSION);
+	c->Message(0, "	%s", CURRENT_VERSION);
 	c->Message(0, "	Compiled on: %s at %s", COMPILE_DATE, COMPILE_TIME);
 	c->Message(0, "	Last modified on: %s", LAST_MODIFIED);
 }

zone/net.cpp

@@ -229,7 +229,7 @@ int main(int argc, char** argv) {
 //	_crtBreakAlloc = 2025;
 #endif
 	
-	_log(ZONE__INIT, "CURRENT_ZONE_VERSION: %s", CURRENT_ZONE_VERSION);
+	_log(ZONE__INIT, "CURRENT_VERSION: %s", CURRENT_VERSION);
 	
 	/*
 	 * Setup nice signal handlers