[mw-devel] MW3 r1012 - trunk/src

[firefury at sucs.org]

Author: firefury
Date: 2008-03-20 16:47:43 +0000 (Thu, 20 Mar 2008)
New Revision: 1012

Modified:
   trunk/src/rooms.c
   trunk/src/script_inst.c
Log:
Might fix the room change messages and scripted emotes...


Modified: trunk/src/rooms.c
===================================================================
--- trunk/src/rooms.c	2008-03-19 17:19:55 UTC (rev 1011)
+++ trunk/src/rooms.c	2008-03-20 16:47:43 UTC (rev 1012)
@@ -11,6 +11,7 @@
 #include "proto.h"
 #include <signal.h>
 #include "talker_privs.h"
+#include "talker.h"
 #include "special.h"
 #include "frl.h"
 #include "strings.h"
@@ -813,7 +814,7 @@
 		else
 		{
 			snprintf(buff,MAXTEXTLENGTH-1,"\03312%s has just arrived in room %d", user->name, i);
-			if (!quiet) talk_send_raw(buff, 2, i);
+			if (!quiet) talk_send_raw(buff, i);
 			user->room = i;
 			update_user(user, userposn);
 
@@ -822,7 +823,7 @@
 			LoadRoom(&myroom, user->room);
 
 			snprintf(buff,MAXTEXTLENGTH-1,"\03313%s has left to room %d", user->name, i);
-			if (!quiet) talk_send_raw(buff, 2, oldroom);
+			if (!quiet) talk_send_raw(buff, oldroom);
 			snprintf(buff,MAXTEXTLENGTH-1,"Leaving room %d for room %d",oldroom,user->room);
 			if (!quiet) display_message(buff, 1, 1);
 		}

Modified: trunk/src/script_inst.c
===================================================================
--- trunk/src/script_inst.c	2008-03-19 17:19:55 UTC (rev 1011)
+++ trunk/src/script_inst.c	2008-03-20 16:47:43 UTC (rev 1012)
@@ -250,19 +250,11 @@
 	for (i=0; i<pc->argc; i++)
 		size+=strlen(pc->argv[i])+1;
 	
-	if (!strcasecmp(pc->inst->name, "emote"))
-		size+=strlen(user->name)+1;
-
 	/* overly generous allocation as later code isnt clean. */
 	size+=512;
 	tmp=(char *)malloc(size);
 	*tmp=0;
 
-	if (!strcasecmp(pc->inst->name, "emote")) {
-		strcat(tmp,user->name);
-		strcat(tmp, " ");
-	}
-
 	count=0;
 	for (i=0; i<pc->argc; i++)
 	{