summaryrefslogtreecommitdiff
path: root/src/gui/char_select.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/char_select.cpp')
-rw-r--r--src/gui/char_select.cpp122
1 files changed, 84 insertions, 38 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 3422ad7f..ad151f25 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -1,40 +1,42 @@
/**
- The Mana World
- Copyright 2004 The Mana World Development Team
-
- This file is part of The Mana World.
-
- The Mana World is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- any later version.
-
- The Mana World is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with The Mana World; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
- By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
+ The Mana World
+ Copyright 2004 The Mana World Development Team
+
+ This file is part of The Mana World.
+
+ The Mana World is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ any later version.
+ The Mana World is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with The Mana World; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ By ElvenProgrammer aka Eugenio Favalli (umperio@users.sourceforge.net)
*/
#include "char_select.h"
#include "../graphic/graphic.h"
+#include "../graphic/2xsai.h"
char button_state[3];
char address[41];
char name[25];
+//short hair_color = 0;
+//short hair_style = 0;
DIALOG char_select_dialog[] = {
/* (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) (dp2) (dp3) */
{ tmw_dialog_proc, 300, 240, 200, 208, 0, -1, 0, 0, 0, 0, (char*)"Char select", NULL, NULL },
- { tmw_text_proc, 308, 268, 192, 10, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL },
- { tmw_bitmap_proc, 304, 282, 192, 70, 0, 0, 0, 0, 80, 60, playerset, NULL, NULL },
+ { tmw_text_proc, 304, 268, 192, 10, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL },
+ { tmw_player_proc, 304, 282, 142, 100, 0, 0, 0, 0, 80, 60, NULL, NULL, NULL },
{ tmw_button_proc, 398, 426, 44, 18, 0, -1, 'o', D_EXIT, -1, 0, (char*)"&Ok", NULL, NULL },
{ tmw_button_proc, 446, 426, 44, 18, 0, -1, 'c', D_EXIT, -1, 0, (char*)"&Cancel", NULL, NULL },
{ tmw_button_proc, 304, 426, 44, 18, 0, 0, 0, D_EXIT, 0, 0, button_state, NULL, NULL },
@@ -45,20 +47,53 @@ DIALOG char_select_dialog[] = {
DIALOG char_create_dialog[] = {
/* (dialog proc) (x) (y) (w) (h) (fg) (bg) (key) (flags) (d1) (d2) (dp) (dp2) (dp3) */
- { tmw_dialog_proc, 276, 240, 248, 116, 0, -1, 0, 0, 0, 0, (char*)"Char create", NULL, NULL },
- { tmw_text_proc, 280, 268, 192, 20, 0, 0, 0, 0, 0, 0, (char *)"Name: ", NULL, NULL },
- { tmw_edit_proc, 336, 268, 162, 20, 0, 0, 0, 0, 24, 0, name, NULL, NULL },
- { tmw_button_proc, 398, 334, 44, 18, 0, -1, 'o', D_EXIT, -1, 0, (char*)"&Ok", NULL, NULL },
- { tmw_button_proc, 446, 334, 44, 18, 0, -1, 'c', D_EXIT, -1, 0, (char*)"&Cancel", NULL, NULL },
+ { tmw_dialog_proc, 300, 240, 200, 208, 0, -1, 0, 0, 0, 0, (char*)"Char create", NULL, NULL },
+ { tmw_text_proc, 302, 386, 192, 20, 0, 0, 0, 0, 0, 0, (char *)"Name: ", NULL, NULL },
+ { tmw_edit_proc, 340, 386, 156, 20, 0, 0, 0, 0, 24, 0, name, NULL, NULL },
+ { tmw_button_proc, 398, 426, 44, 18, 0, -1, 'o', D_EXIT, -1, 0, (char*)"&Ok", NULL, NULL },
+ { tmw_button_proc, 446, 426, 44, 18, 0, -1, 'c', D_EXIT, -1, 0, (char*)"&Cancel", NULL, NULL },
+ { tmw_player_proc, 304, 282, 142, 100, 0, 0, 0, 0, 80, 60, NULL, NULL, NULL },
+ { tmw_incbutt_proc, 450, 282, 20, 20, 0, 0, 0, 0, 2, 0, (char*)"<", &char_info->hair_color, NULL },
+ { tmw_incbutt_proc, 472, 282, 20, 20, 0, 0, 0, 0, 1, 0, (char*)">", &char_info->hair_color, NULL },
{ NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL },
};
+#define MAX_HAIR_COLOR 6
+
+int tmw_incbutt_proc(int msg, DIALOG *d, int c) {
+ if(msg==MSG_CLICK) {
+ //alert("","","","","",0,0);
+ if(d->d1==1)char_info->hair_color++;
+ else if(d->d1==2)char_info->hair_color--;
+ if(char_info->hair_color<1)char_info->hair_color = MAX_HAIR_COLOR+1;
+ if(char_info->hair_color>MAX_HAIR_COLOR+1)char_info->hair_color = 1;
+ d->flags = 0;
+ return D_O_K;
+ }
+ return tmw_button_proc(msg, d, c);
+}
+
+int tmw_player_proc(int msg, DIALOG *d, int c) {
+ if(msg==MSG_DRAW) {
+ tmw_bitmap_proc(MSG_DRAW, d, 0);
+ //BITMAP *temp = create_bitmap(60, 50);
+ //clear_to_color(temp, makecol(255, 255, 255));
+ if(n_character>0) {
+ masked_blit(playerset, gui_bitmap, 0, 0, d->x-10+40, d->y-10+30, 80, 60);
+ masked_blit(hairset, gui_bitmap, 20*(char_info->hair_color-1), 0, d->x+21+40, d->y+5+30, 20, 20);
+ }
+ //Super2xSaI(temp, gui_bitmap, 0, 0, d->x, d->y, temp->w*2, temp->h*2);
+ //blit(temp, gui_bitmap, 0, 0, d->x, d->y, 60,50);
+ }
+ return D_O_K;
+}
+
void char_select() {
state = LOGIN;
if(n_character>0) {
char_select_dialog[1].dp = char_info->name;
char_select_dialog[1].x = 400-alfont_text_length(gui_font, char_info->name)/2;
- char_select_dialog[2].dp = playerset;
+ //char_select_dialog[2].dp = playerset;
if(playerset==NULL)ok("Error", "Playerset not loaded");
strcpy(button_state, "Del");
char_select_dialog[3].flags &= D_CLOSE;
@@ -69,18 +104,21 @@ void char_select() {
char_select_dialog[3].flags |= D_DISABLED;
char_select_dialog[2].dp = NULL;
strcpy(button_state, "New");
+ char_info->hair_color = 1;
+ char_info->hair_style = 1;
}
- //centre_dialog(char_select_dialog);
+ //centre_dialog(char_select_dialog);
DIALOG_PLAYER *player = init_dialog(char_select_dialog, -1);
+ //centre_dialog(char_select_dialog);
int gui_exit = 1;
- while ((!key[KEY_ESC])&&(gui_exit)&&(!key[KEY_ENTER])) {
+ while((!key[KEY_ESC])&&(gui_exit)&&(!key[KEY_ENTER])) {
clear_bitmap(buffer);
blit((BITMAP *)graphic[LOGIN_BMP].dat, buffer, 0, 0, 0, 0, 800, 600);
gui_exit = gui_update(player);
blit(buffer, screen, 0, 0, 0, 0, 800, 600);
}
gui_exit = shutdown_dialog(player);
- if((gui_exit==3)||(key[KEY_ENTER]))server_char_select();
+ if((gui_exit==3)||((key[KEY_ENTER])&&(strcmp(button_state, "Del")==0)))server_char_select();
else if(gui_exit==4)close_session();
else if(gui_exit==5)server_char_delete();
if(state==LOGIN)close_session();
@@ -134,7 +172,7 @@ void server_char_delete() {
if(yes_no("Confirm", "Are you sure?")==0) {
// Request character deletion
WFIFOW(0) = net_w_value(0x0068);
- WFIFOL(2) = net_l_value(char_info[0].id);
+ WFIFOL(2) = net_l_value(char_info->id);
WFIFOSET(46);
while((in_size<2)||(out_size>0))flush();
@@ -157,6 +195,8 @@ void server_char_delete() {
}
// Create a new character
} else {
+ n_character = 1;
+
centre_dialog(char_create_dialog);
DIALOG_PLAYER *player = init_dialog(char_create_dialog, -1);
int gui_exit = 1;
@@ -177,15 +217,15 @@ void server_char_delete() {
WFIFOB(30) = net_b_value(5);
WFIFOB(31) = net_b_value(5);
WFIFOB(32) = net_b_value(0);
- WFIFOW(33) = net_w_value(1);
- WFIFOW(35) = net_w_value(1);
+ WFIFOW(33) = net_w_value(char_info->hair_color);
+ WFIFOW(35) = net_w_value(char_info->hair_style);
WFIFOSET(37);
while((in_size<3)||(out_size>0))flush();
if(RFIFOW(0)==0x006d) {
while(in_size<108)flush();
char_info = (PLAYER_INFO *)malloc(sizeof(PLAYER_INFO));
- char_info->id = account_ID;
+ char_info->id = RFIFOL(2);//account_ID;
memset(char_info->name, '\0', 24);
strcpy(char_info[0].name, RFIFOP(2+74));
char_info->hp = RFIFOW(2+42);
@@ -203,8 +243,10 @@ void server_char_delete() {
char_info->INT = RFIFOB(2+101);
char_info->DEX = RFIFOB(2+102);
char_info->LUK = RFIFOB(2+103);
+ char_info->hair_style = RFIFOW(2+54);
+ char_info->hair_color = RFIFOW(2+70);
RFIFOSKIP(108);
- n_character++;
+ //n_character++;
} else if(RFIFOW(0)==0x006c) {
switch(RFIFOB(2)) {
case 0:
@@ -215,7 +257,11 @@ void server_char_delete() {
break;
}
RFIFOSKIP(3);
- } else ok("Error", "Unknown error");
- }
+ n_character = 0;
+ } else {
+ ok("Error", "Unknown error");
+ n_character = 0;
+ }
+ } else n_character = 0;
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-27 00:13:43 +0000