Removed undo and prefab...

3 files changed, 3 insertions, 39 deletions

diff --git a/src/fpsgame/client.cpp b/src/fpsgame/client.cpp
index 2ad6a6f..bd98625 100644
--- a/src/fpsgame/client.cpp
+++ b/src/fpsgame/client.cpp
@@ -441,16 +441,6 @@ namespace game {
 				}
 				break;
 			}
-			case EDIT_UNDO:
-			case EDIT_REDO: {
-				uchar *outbuf = NULL;
-				int inlen = 0, outlen = 0;
-				if(packundo(op, inlen, outbuf, outlen)) {
-					if(addmsg(N_EDITF + op, "ri2", inlen, outlen)) messages.put(outbuf, outlen);
-					delete[] outbuf;
-				}
-				break;
-			}
 		}
 	}
 	void printvar(fpsent *d, ident *id) {
@@ -1184,14 +1174,6 @@ namespace game {
 				if(d) unpackeditinfo(d->edit, q.buf, q.maxlen, unpacklen);
 				break;
 			}
-			case N_UNDO:
-			case N_REDO: {
-				int cn = getint(p), unpacklen = getint(p), packlen = getint(p);
-				fpsent *d = getclient(cn);
-				ucharbuf q = p.subbuf(max(packlen, 0));
-				if(d) unpackundo(q.buf, q.maxlen, unpacklen);
-				break;
-			}
 			case N_EDITF:			  // coop editing messages
 			case N_EDITT:
 			case N_EDITM:
diff --git a/src/fpsgame/game.h b/src/fpsgame/game.h
index dadebd5..5b95c5a 100644
--- a/src/fpsgame/game.h
+++ b/src/fpsgame/game.h
@@ -130,7 +130,7 @@ enum {
 	N_PING, N_PONG, N_CLIENTPING,
 	N_TIMEUP, N_FORCEINTERMISSION,
 	N_SERVMSG, N_ITEMLIST, N_RESUME,
-	N_EDITMODE, N_EDITENT, N_EDITF, N_EDITT, N_EDITM, N_FLIP, N_COPY, N_PASTE, N_ROTATE, N_REPLACE, N_DELCUBE, N_REMIP, N_EDITVSLOT, N_UNDO, N_REDO, N_NEWMAP, N_GETMAP, N_SENDMAP, N_CLIPBOARD, N_EDITVAR,
+	N_EDITMODE, N_EDITENT, N_EDITF, N_EDITT, N_EDITM, N_FLIP, N_COPY, N_PASTE, N_ROTATE, N_REPLACE, N_DELCUBE, N_REMIP, N_EDITVSLOT, N_NEWMAP, N_GETMAP, N_SENDMAP, N_CLIPBOARD, N_EDITVAR,
 	N_MASTERMODE, N_KICK, N_CLEARBANS, N_CURRENTMASTER, N_SPECTATOR, N_SETMASTER, N_SETTEAM, N_ANNOUNCE,
 	N_LISTDEMOS, N_SENDDEMOLIST, N_GETDEMO, N_SENDDEMO,
 	N_DEMOPLAYBACK, N_RECORDDEMO, N_STOPDEMO, N_CLEARDEMOS,
@@ -157,7 +157,7 @@ static const int msgsizes[] = {			   // size inclusive message token, 0 for vari
 	N_PING, 2, N_PONG, 2, N_CLIENTPING, 2,
 	N_TIMEUP, 2, N_FORCEINTERMISSION, 1,
 	N_SERVMSG, 0, N_ITEMLIST, 0, N_RESUME, 0,
-	N_EDITMODE, 2, N_EDITENT, 11, N_EDITF, 16, N_EDITT, 16, N_EDITM, 16, N_FLIP, 14, N_COPY, 14, N_PASTE, 14, N_ROTATE, 15, N_REPLACE, 17, N_DELCUBE, 14, N_REMIP, 1, N_EDITVSLOT, 16, N_UNDO, 0, N_REDO, 0, N_NEWMAP, 2, N_GETMAP, 1, N_SENDMAP, 0, N_EDITVAR, 0,
+	N_EDITMODE, 2, N_EDITENT, 11, N_EDITF, 16, N_EDITT, 16, N_EDITM, 16, N_FLIP, 14, N_COPY, 14, N_PASTE, 14, N_ROTATE, 15, N_REPLACE, 17, N_DELCUBE, 14, N_REMIP, 1, N_EDITVSLOT, 16, N_NEWMAP, 2, N_GETMAP, 1, N_SENDMAP, 0, N_EDITVAR, 0,
 	N_MASTERMODE, 2, N_KICK, 0, N_CLEARBANS, 1, N_CURRENTMASTER, 0, N_SPECTATOR, 3, N_SETMASTER, 0, N_SETTEAM, 0, N_ANNOUNCE, 2,
 	N_LISTDEMOS, 1, N_SENDDEMOLIST, 0, N_GETDEMO, 3, N_SENDDEMO, 0,
 	N_DEMOPLAYBACK, 3, N_RECORDDEMO, 2, N_STOPDEMO, 1, N_CLEARDEMOS, 2,
diff --git a/src/fpsgame/server.cpp b/src/fpsgame/server.cpp
index 7070fb8..2856e53 100644
--- a/src/fpsgame/server.cpp
+++ b/src/fpsgame/server.cpp
@@ -1153,7 +1153,7 @@ namespace server {
 					N_ANNOUNCE, N_SENDDEMOLIST, N_SENDDEMO, N_DEMOPLAYBACK, N_SENDMAP,
 					N_CLIENT, N_AUTHCHAL, N_INITAI, N_EXPIRETOKENS, N_DROPTOKENS, N_STEALTOKENS, N_DEMOPACKET, -2, N_REMIP,
 					N_NEWMAP, N_GETMAP, N_SENDMAP, N_CLIPBOARD, -3, N_EDITENT, N_EDITF, N_EDITT, N_EDITM, N_FLIP, N_COPY, N_PASTE, N_ROTATE, N_REPLACE,
-					N_DELCUBE, N_EDITVAR, N_EDITVSLOT, N_UNDO, N_REDO, -4, N_POS, NUMMSG),
+					N_DELCUBE, N_EDITVAR, N_EDITVSLOT, -4, N_POS, NUMMSG),
 	  connectfilter(-1, N_CONNECT, -2, N_AUTHANS, -3, N_PING, NUMMSG);
 	int checktype(int type, clientinfo *ci) {
 		if(ci) {
@@ -2792,27 +2792,9 @@ namespace server {
 				if(ci && ci->state.state!=CS_SPECTATOR) QUEUE_MSG;
 				break;
 			}
-			case N_UNDO:
-			case N_REDO: {
-				int unpacklen = getint(p), packlen = getint(p);
-				if(!ci || ci->state.state==CS_SPECTATOR || packlen <= 0 || packlen > (1<<16) || unpacklen <= 0) {
-					if(packlen > 0) p.subbuf(packlen);
-					break;
-				}
-				//~if(p.remaining() < packlen) { disconnect_client(sender, DISC_MSGERR); return; }
-				packetbuf q(32 + packlen, ENET_PACKET_FLAG_RELIABLE);
-				putint(q, type);
-				putint(q, ci->clientnum);
-				putint(q, unpacklen);
-				putint(q, packlen);
-				if(packlen > 0) p.get(q.subbuf(packlen).buf, packlen);
-				sendpacket(-1, 1, q.finalize(), ci->clientnum);
-				break;
-			}
 			case N_SERVCMD:
 				getstring(text, p);
 				break;
-
 			case -1:
 				//~disconnect_client(sender, DISC_MSGERR);
 				return;