Переглянути джерело

move gender command to /modify character set gender x, fixed log message for name filter

Emagi 1 рік тому
батько
коміт
ed37fd5d1e

+ 6 - 12
EQ2/source/WorldServer/Commands/Commands.cpp

@@ -2829,18 +2829,6 @@ void Commands::Process(int32 index, EQ2_16BitString* command_parms, Client* clie
 				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"Usage:  /class {class_id}");
 			break;
 						   }
-		case COMMAND_GENDER:{
-			if(sep && sep->arg[ndx][0]){
-				client->GetPlayer()->GetInfoStruct()->set_gender(atoi(sep->arg[ndx]));
-				client->GetPlayer()->SetCharSheetChanged(true);
-				client->UpdateTimeStampFlag ( GENDER_UPDATE_FLAG );
-			}else{
-				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"Usage:  /gender {new_gender_id}");
-				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"  Male: 1");
-				client->SimpleMessage(CHANNEL_COLOR_YELLOW,"  Female: 2");
-			}
-			break;
-							}
 		case COMMAND_FLYMODE:{
 			if(sep && sep->arg[0] && sep->IsNumber(0)){
 				PrintSep(sep, "COMMAND_FLYMODE");
@@ -7627,6 +7615,12 @@ void Commands::Command_ModifyCharacter(Client* client, Seperator* sep)
 				player->GetInfoStruct()->set_tradeskill_class3(player->GetTradeskillClass());
 				player->SetCharSheetChanged(true);
 			}
+			else if (strcmp(sep->arg[1], "gender") == 0) {
+				int8 gender = atoi(sep->arg[2]);
+				client->GetPlayer()->GetInfoStruct()->set_gender(gender);
+				client->GetPlayer()->SetCharSheetChanged(true);
+				client->UpdateTimeStampFlag ( GENDER_UPDATE_FLAG );
+			}
 		}
 	}
 	else

+ 0 - 1
EQ2/source/WorldServer/Commands/Commands.h

@@ -603,7 +603,6 @@ private:
 #define COMMAND_RACE				2
 #define COMMAND_LEVEL				3
 #define COMMAND_CLASS				4
-#define COMMAND_GENDER				5
 #define COMMAND_NAME				6
 #define	COMMAND_SAY					7
 #define	COMMAND_TELL				8

+ 1 - 1
EQ2/source/WorldServer/client.cpp

@@ -11453,7 +11453,7 @@ void Client::HandleDialogSelectMsg(int32 conversation_id, int32 response_index)
 bool Client::SetPetName(const char* petName) {
 	int8 result = database.CheckNameFilter(petName,4,31);
 	if (result == BADNAMELENGTH_REPLY) {
-		SimpleMessage(CHANNEL_COLOR_YELLOW, "Name length is invalid, must be greater then 3 characters and less then 16.");
+		SimpleMessage(CHANNEL_COLOR_YELLOW, "Name length is invalid, must be greater then 3 characters and less then 31.");
 		return false;
 	}
 	else if (result == NAMEINVALID_REPLY) {