libheretic: Further multiplayer cheat code entry fixes

skyjake · Jul 25, 2013 · 9340575 · 9340575
1 parent 1f1f468
commit 9340575
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/doomsday/plugins/heretic/src/h_console.c b/doomsday/plugins/heretic/src/h_console.c
@@ -186,7 +186,7 @@ ccmdtemplate_t gameCCmds[] = {
     {"viewmode",    NULL,   CCmdSetViewMode},
 
     // Heretic specific
-    {"chicken",     "",     CCmdCheatMorph},
+    {"chicken",     NULL,   CCmdCheatMorph},
     {NULL}
 };
 

diff --git a/doomsday/plugins/heretic/src/m_cheat.c b/doomsday/plugins/heretic/src/m_cheat.c
@@ -52,7 +52,6 @@ CHEAT_FUNC(InvItem2);
 CHEAT_FUNC(InvItem3);
 CHEAT_FUNC(IDKFA);
 CHEAT_FUNC(IDDQD);
-CHEAT_FUNC(NoOp); // Play a sound but otherwise ignore.
 CHEAT_FUNC(Reveal);
 
 void G_RegisterCheats(void)
@@ -66,14 +65,14 @@ void G_RegisterCheats(void)
     ADDCHEAT("idkfa",               IDKFA);
     ADDCHEATCMD("kitty",            "noclip %p");
     ADDCHEATCMD("massacre",         "kill");
-    ADDCHEAT("noise",               NoOp);
+    ADDCHEATCMD("noise",            "playsound dorcls"); // ignored, play sound
     ADDCHEATCMD("ponce",            "give h %p");
     ADDCHEATCMD("quicken",          "god %p");
     ADDCHEATCMD("rambo",            "give wpar2 %p");
     ADDCHEAT("ravmap",              Reveal);
     ADDCHEATCMD("shazam",           "give t %p");
     ADDCHEATCMD("skel",             "give k %p");
-    ADDCHEAT("ticker",              NoOp);
+    ADDCHEATCMD("ticker",           "playsound dorcls"); // ignored, play sound
 }
 
 CHEAT_FUNC(InvItem)
@@ -202,15 +201,6 @@ CHEAT_FUNC(Reveal)
     return true;
 }
 
-CHEAT_FUNC(NoOp)
-{
-    DENG_UNUSED(args);
-    DENG_UNUSED(player);
-
-    S_LocalSound(SFX_DORCLS, NULL);
-    return true;
-}
-
 /**
  * The multipurpose cheat ccmd.
  */
@@ -432,7 +422,7 @@ D_CMD(CheatGive)
 
     if(IS_CLIENT)
     {
-        if(argc != 2) return false;
+        if(argc < 2) return false;
 
         sprintf(buf, "give %s", argv[1]);
         NetCl_CheatRequest(buf);