Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show welcome message after #627

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions gamemodes/sss/core/player/accounts.pwn
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,6 @@ DisplayRegisterPrompt(playerid)
}

Logger_Log("account created", Logger_P(playerid));

ShowWelcomeMessage(playerid, 10);
}
else
{
Expand Down
9 changes: 5 additions & 4 deletions gamemodes/sss/core/player/spawn.pwn
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ hook OnPlayerConnect(playerid)
//
//timer LoadClassUI[1](playerid)
//{
ClassButtonMale[playerid] =CreatePlayerTextDraw(playerid, 250.000000, 200.000000, "~n~Male~n~~n~");
ClassButtonMale[playerid] =CreatePlayerTextDraw(playerid, 240.000000, 200.000000, "~n~Male~n~~n~");
PlayerTextDrawAlignment (playerid, ClassButtonMale[playerid], 2);
PlayerTextDrawBackgroundColor (playerid, ClassButtonMale[playerid], 255);
PlayerTextDrawFont (playerid, ClassButtonMale[playerid], 1);
Expand All @@ -122,7 +122,7 @@ hook OnPlayerConnect(playerid)
PlayerTextDrawTextSize (playerid, ClassButtonMale[playerid], 44.000000, 100.000000);
PlayerTextDrawSetSelectable (playerid, ClassButtonMale[playerid], true);

ClassButtonFemale[playerid] =CreatePlayerTextDraw(playerid, 390.000000, 200.000000, "~n~Female~n~~n~");
ClassButtonFemale[playerid] =CreatePlayerTextDraw(playerid, 400.000000, 200.000000, "~n~Female~n~~n~");
PlayerTextDrawAlignment (playerid, ClassButtonFemale[playerid], 2);
PlayerTextDrawBackgroundColor (playerid, ClassButtonFemale[playerid], 255);
PlayerTextDrawFont (playerid, ClassButtonFemale[playerid], 1);
Expand Down Expand Up @@ -249,8 +249,8 @@ PlayerCreateNewCharacter(playerid)

if(IsPlayerLoggedIn(playerid))
{
PlayerTextDrawSetString(playerid, ClassButtonMale[playerid], sprintf("~n~%s~n~~n~", ls(playerid, "GENDER_M")));
PlayerTextDrawSetString(playerid, ClassButtonFemale[playerid], sprintf("~n~%s~n~~n~", ls(playerid, "GENDER_F")));
PlayerTextDrawSetString(playerid, ClassButtonMale[playerid], sprintf("~n~%s~n~~n~", ls(playerid, "GENDER_M", true)));
PlayerTextDrawSetString(playerid, ClassButtonFemale[playerid], sprintf("~n~%s~n~~n~", ls(playerid, "GENDER_F", true)));
PlayerTextDrawShow(playerid, ClassButtonMale[playerid]);
PlayerTextDrawShow(playerid, ClassButtonFemale[playerid]);
SelectTextDraw(playerid, 0xFFFFFF88);
Expand Down Expand Up @@ -332,6 +332,7 @@ PlayerSpawnNewCharacter(playerid, gender)

if(IsNewPlayer(playerid))
{
ShowWelcomeMessage(playerid, 5);
SetPlayerHP(playerid, spawn_NewBlood);
SetPlayerFP(playerid, spawn_NewFood);
SetPlayerBleedRate(playerid, spawn_NewBleed);
Expand Down