Changeset 26 for trunk/Classes/game_preferences.mm

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/game_preferences.mm (modified) (5 diffs)

trunk/Classes/game_preferences.mm

@@ -378 +378 @@
     const std::string res = preferences::get("login");
     if(res.empty()) {
-        //char* const login = getenv("USER");
-        //if(login != NULL) {
-        //  return login;
-        //}
-        
+/*      
         NSString *nsName = [[UIDevice currentDevice] name];
         if (!nsName)
             return ("Player");
-        std::string res2 = [nsName cStringUsingEncoding:NSASCIIStringEncoding];
+        std::string res2;
+        const char *cName = [nsName UTF8String];
+        if (cName == NULL)
+            return ("Player");
+        res2 = cName;
 
         if(res2.empty()) {
@@ -392 +392 @@
         }
         return res2;
+ */
+        return ("Player");
     }
 
@@ -423 +425 @@
 }
 
+std::string sync_login_str()
+{
+    const std::string res = preferences::get("sync_login");
+    if(res.empty()) 
+    {
+        return ("");
+    }
+    
+    return res;
+}
+    
+void set_sync_login(const std::string& username)
+{
+    preferences::set("sync_login", username);
+}
+    
+std::string sync_password()
+{
+    const std::string res = preferences::get("sync_password");
+    if(res.empty()) 
+    {
+        return ("");
+    }
+    
+    return res;
+}
+
+void set_sync_password(const std::string& password)
+{
+    preferences::set("sync_password", password);
+}
+
+
 bool remember_password()
 {
@@ -709 +744 @@
 std::string clock_format()
 {
+/*  
+    if (clock_format_cache.size() > 0)
+        return clock_format
     if(preferences::get("clock_format").size())
         return preferences::get("clock_format");
     else
         preferences::set("clock_format", "%H:%M");
+*/
+    // KP: save 14% cpu
     return "%H:%M";
 }
@@ -959 +999 @@
 {
     total_kills++;
-    if (total_kills >= 1000 && !achievement_earned(ACHIEVEMENT_BATTLE_MASTER))
-        earn_achievement(ACHIEVEMENT_BATTLE_MASTER);
+    if (total_kills >= 1000 && !achievement_earned(ACHIEVEMENT_PREDATOR))
+        earn_achievement(ACHIEVEMENT_PREDATOR);
     else if (total_kills >= 500 && !achievement_earned(ACHIEVEMENT_BONE_CRUSHER))
         earn_achievement(ACHIEVEMENT_BONE_CRUSHER);
-    else if (total_kills >= 100 && !achievement_earned(ACHIEVEMENT_PREDATOR))
-        earn_achievement(ACHIEVEMENT_PREDATOR);
+    else if (total_kills >= 100 && !achievement_earned(ACHIEVEMENT_BATTLE_MASTER))
+        earn_achievement(ACHIEVEMENT_BATTLE_MASTER);
     else if (total_kills >= 50 && !achievement_earned(ACHIEVEMENT_SLAYER))
         earn_achievement(ACHIEVEMENT_SLAYER);