Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client/gui chatclient.cpp,1.4,1.5 psdcmain.cpp,1.17,1.18 psdcpath.cpp,1.5,1.6 psdcskil.cpp,1.7,1.8 psdmmenu.cpp,1.4,1.5 psdsplsh.cpp,1.4,1.5 template.cpp,1.2,1.3
|
From: Daniel A. <cor...@us...> - 2002-01-28 20:09:51
|
Update of /cvsroot/planeshift/planeshift/src/client/gui
In directory usw-pr-cvs1:/tmp/cvs-serv32162/src/client/gui
Modified Files:
chatclient.cpp psdcmain.cpp psdcpath.cpp psdcskil.cpp
psdmmenu.cpp psdsplsh.cpp template.cpp
Log Message:
changes to chat client
Index: chatclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/chatclient.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** chatclient.cpp 2002/01/28 19:53:25 1.4
--- chatclient.cpp 2002/01/28 20:09:48 1.5
***************
*** 32,39 ****
char *pType;
! char buff[2000];
!
! strcpy(buff,"");
!
msg.GetTypeText(pType);
--- 32,36 ----
char *pType;
! char buff[1024];
msg.GetTypeText(pType);
***************
*** 45,69 ****
case CHAT_AUCTION:
{
! sprintf(buff,"%s from %s: %s\n",pType,(const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_SAY:
{
! sprintf(buff,"%s says: %s\n",(const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_ME:
{
! sprintf(buff,"%s %s\n",(const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_TELL:
{
! sprintf(buff,"%s tells you: %s\n",(const char *)msg.sPerson,(const char *)msg.sText);
break;
}
default:
{
! sprintf(buff,"Unknown Chat Type: %d\n",msg.iChatType);
break;
}
--- 42,70 ----
case CHAT_AUCTION:
{
! snprintf(buff,1024,"%s from %s: %s\n",pType,
! (const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_SAY:
{
! snprintf(buff,1024,"%s says: %s\n",
! (const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_ME:
{
! snprintf(buff,1024,"%s %s\n",
! (const char *)msg.sPerson,(const char *)msg.sText);
break;
}
case CHAT_TELL:
{
! snprintf(buff,1024,"%s tells you: %s\n",
! (const char *)msg.sPerson,(const char *)msg.sText);
break;
}
default:
{
! snprintf(buff,1024,"Unknown Chat Type: %d\n",msg.iChatType);
break;
}
***************
*** 129,135 ****
chattype = CHAT_ME;
}
else
{
! return "Sorry, but /say, /me, /shout, /group, /guild, /auction and /tell <person> are the only allowable commands.";
}
--- 130,141 ----
chattype = CHAT_ME;
}
+ else if (!strncmp(buff+1,"help ",5))
+ {
+ return "Valid commands: /say, /me, /shout, /group, /guild, "
+ "/auction, /tell and /help";
+ }
else
{
! return "Invalid command (use /help)";
}
Index: psdcmain.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcmain.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** psdcmain.cpp 2002/01/28 03:58:31 1.17
--- psdcmain.cpp 2002/01/28 20:09:48 1.18
***************
*** 537,567 ****
psTraitSet *set = character->GetTraits();
! sprintf(txt,"%d", 0);
! sprintf(txt,"%d", set->GetTrait(ST_STRENGTH)->GetNormalValue());
caster = (psText*)GetComp(1000);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_ENDURANCE)->GetNormalValue());
caster = (psText*)GetComp(1001);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_AGILITY)->GetNormalValue());
caster = (psText*)GetComp(1002);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_INTELLIGENCE)->GetNormalValue());
caster = (psText*)GetComp(1003);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_WISDOM)->GetNormalValue());
caster = (psText*)GetComp(1004);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_CHARISMA)->GetNormalValue());
caster = (psText*)GetComp(1005);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(ST_BASERP)->GetNormalValue());
caster = (psText*)GetComp(1006);
caster->SetText(txt);
--- 537,567 ----
psTraitSet *set = character->GetTraits();
! snprintf(txt,3,"%d", 0);
! snprintf(txt,3,"%d", set->GetTrait(ST_STRENGTH)->GetNormalValue());
caster = (psText*)GetComp(1000);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_ENDURANCE)->GetNormalValue());
caster = (psText*)GetComp(1001);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_AGILITY)->GetNormalValue());
caster = (psText*)GetComp(1002);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_INTELLIGENCE)->GetNormalValue());
caster = (psText*)GetComp(1003);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_WISDOM)->GetNormalValue());
caster = (psText*)GetComp(1004);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_CHARISMA)->GetNormalValue());
caster = (psText*)GetComp(1005);
caster->SetText(txt);
! snprintf(txt,3,"%d", set->GetTrait(ST_BASERP)->GetNormalValue());
caster = (psText*)GetComp(1006);
caster->SetText(txt);
Index: psdcpath.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcpath.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** psdcpath.cpp 2002/01/28 03:58:31 1.5
--- psdcpath.cpp 2002/01/28 20:09:48 1.6
***************
*** 1,51 ****
! /*
! * template.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdcpath.h"
!
! //-------------------------------------------------------------------
!
! bool psdcPath::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("creapath.gif"))) return false;
!
! return true;
! }
!
! //-------------------------------------------------------------------
! void psdcPath::ChangeText( psDialog* , int )
! {
! }
--- 1,51 ----
! /*
! * template.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdcpath.h"
!
! //-------------------------------------------------------------------
!
! bool psdcPath::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("creapath.gif"))) return false;
!
! return true;
! }
!
! //-------------------------------------------------------------------
! void psdcPath::ChangeText( psDialog* , int )
! {
! }
Index: psdcskil.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdcskil.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** psdcskil.cpp 2002/01/28 03:58:31 1.7
--- psdcskil.cpp 2002/01/28 20:09:48 1.8
***************
*** 551,708 ****
psTraitSet *set = character->GetTraits();
! sprintf(txt,"%d", 0);
int SkillIP; int StatIP;
set->GetIPPoints(StatIP,SkillIP);
! sprintf(txt,"%d", SkillIP);
caster = (psText*)GetComp(76);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AR_LIGHT)->GetNormalValue());
caster = (psText*)GetComp(77);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AR_MEDIUM)->GetNormalValue());
caster = (psText*)GetComp(78);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AR_HEAVY)->GetNormalValue());
caster = (psText*)GetComp(79);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AR_SHIELD)->GetNormalValue());
caster = (psText*)GetComp(80);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_SWORD)->GetNormalValue());
caster = (psText*)GetComp(81);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_KNIFE)->GetNormalValue());
caster = (psText*)GetComp(82);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_AXE)->GetNormalValue());
caster = (psText*)GetComp(83);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_HAMMER)->GetNormalValue());
caster = (psText*)GetComp(84);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_MELEE)->GetNormalValue());
caster = (psText*)GetComp(85);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_POLEARM)->GetNormalValue());
caster = (psText*)GetComp(86);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_W_RANGED)->GetNormalValue());
caster = (psText*)GetComp(87);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_ASSASSINWEAPON)->GetNormalValue());
caster = (psText*)GetComp(88);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_BACKSTAB)->GetNormalValue());
caster = (psText*)GetComp(89);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_CLIMB)->GetNormalValue());
caster = (psText*)GetComp(90);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_TRAPDETECT)->GetNormalValue());
caster = (psText*)GetComp(91);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_HIDE)->GetNormalValue());
caster = (psText*)GetComp(92);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_LOCKPICK)->GetNormalValue());
caster = (psText*)GetComp(93);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_PICKPOCKET)->GetNormalValue());
caster = (psText*)GetComp(94);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_SA_TRAPSET)->GetNormalValue());
caster = (psText*)GetComp(95);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_CRYSTAL)->GetNormalValue());
caster = (psText*)GetComp(96);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_AZURE)->GetNormalValue());
caster = (psText*)GetComp(97);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_BLUE)->GetNormalValue());
caster = (psText*)GetComp(98);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_RED)->GetNormalValue());
caster = (psText*)GetComp(99);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_BROWN)->GetNormalValue());
caster = (psText*)GetComp(100);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_AL_DARK)->GetNormalValue());
caster = (psText*)GetComp(101);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_ALCHEMY)->GetNormalValue());
caster = (psText*)GetComp(102);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_ANTIMAGIC)->GetNormalValue());
caster = (psText*)GetComp(103);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_ARMORSMITH)->GetNormalValue());
caster = (psText*)GetComp(104);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_EMPATHY)->GetNormalValue());
caster = (psText*)GetComp(105);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_HERBAL)->GetNormalValue());
caster = (psText*)GetComp(106);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_K_WEAPONSMITH)->GetNormalValue());
caster = (psText*)GetComp(107);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_P_BODYDEV)->GetNormalValue());
caster = (psText*)GetComp(108);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_P_RIDING)->GetNormalValue());
caster = (psText*)GetComp(109);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_P_SWIMMING)->GetNormalValue());
caster = (psText*)GetComp(110);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_MA_ARGAN)->GetNormalValue());
caster = (psText*)GetComp(111);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_MA_ESTERIA)->GetNormalValue());
caster = (psText*)GetComp(112);
caster->SetText(txt);
! sprintf(txt,"%d", set->GetTrait(SK_MA_LAHAR)->GetNormalValue());
caster = (psText*)GetComp(113);
caster->SetText(txt);
--- 551,708 ----
psTraitSet *set = character->GetTraits();
! snprintf(txt,4,"%d", 0);
int SkillIP; int StatIP;
set->GetIPPoints(StatIP,SkillIP);
! snprintf(txt,4,"%d", SkillIP);
caster = (psText*)GetComp(76);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AR_LIGHT)->GetNormalValue());
caster = (psText*)GetComp(77);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AR_MEDIUM)->GetNormalValue());
caster = (psText*)GetComp(78);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AR_HEAVY)->GetNormalValue());
caster = (psText*)GetComp(79);
caster->SetText(txt);
! snprintf(txt,4,,4,"%d", set->GetTrait(SK_AR_SHIELD)->GetNormalValue());
caster = (psText*)GetComp(80);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_SWORD)->GetNormalValue());
caster = (psText*)GetComp(81);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_KNIFE)->GetNormalValue());
caster = (psText*)GetComp(82);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_AXE)->GetNormalValue());
caster = (psText*)GetComp(83);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_HAMMER)->GetNormalValue());
caster = (psText*)GetComp(84);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_MELEE)->GetNormalValue());
caster = (psText*)GetComp(85);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_POLEARM)->GetNormalValue());
caster = (psText*)GetComp(86);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_W_RANGED)->GetNormalValue());
caster = (psText*)GetComp(87);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_ASSASSINWEAPON)->GetNormalValue());
caster = (psText*)GetComp(88);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_BACKSTAB)->GetNormalValue());
caster = (psText*)GetComp(89);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_CLIMB)->GetNormalValue());
caster = (psText*)GetComp(90);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_TRAPDETECT)->GetNormalValue());
caster = (psText*)GetComp(91);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_HIDE)->GetNormalValue());
caster = (psText*)GetComp(92);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_LOCKPICK)->GetNormalValue());
caster = (psText*)GetComp(93);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_PICKPOCKET)->GetNormalValue());
caster = (psText*)GetComp(94);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_SA_TRAPSET)->GetNormalValue());
caster = (psText*)GetComp(95);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_CRYSTAL)->GetNormalValue());
caster = (psText*)GetComp(96);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_AZURE)->GetNormalValue());
caster = (psText*)GetComp(97);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_BLUE)->GetNormalValue());
caster = (psText*)GetComp(98);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_RED)->GetNormalValue());
caster = (psText*)GetComp(99);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_BROWN)->GetNormalValue());
caster = (psText*)GetComp(100);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_AL_DARK)->GetNormalValue());
caster = (psText*)GetComp(101);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_ALCHEMY)->GetNormalValue());
caster = (psText*)GetComp(102);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_ANTIMAGIC)->GetNormalValue());
caster = (psText*)GetComp(103);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_ARMORSMITH)->GetNormalValue());
caster = (psText*)GetComp(104);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_EMPATHY)->GetNormalValue());
caster = (psText*)GetComp(105);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_HERBAL)->GetNormalValue());
caster = (psText*)GetComp(106);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_K_WEAPONSMITH)->GetNormalValue());
caster = (psText*)GetComp(107);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_P_BODYDEV)->GetNormalValue());
caster = (psText*)GetComp(108);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_P_RIDING)->GetNormalValue());
caster = (psText*)GetComp(109);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_P_SWIMMING)->GetNormalValue());
caster = (psText*)GetComp(110);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_MA_ARGAN)->GetNormalValue());
caster = (psText*)GetComp(111);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_MA_ESTERIA)->GetNormalValue());
caster = (psText*)GetComp(112);
caster->SetText(txt);
! snprintf(txt,4,"%d", set->GetTrait(SK_MA_LAHAR)->GetNormalValue());
caster = (psText*)GetComp(113);
caster->SetText(txt);
***************
*** 711,712 ****
--- 711,713 ----
}
+
Index: psdmmenu.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdmmenu.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** psdmmenu.cpp 2002/01/28 03:58:31 1.4
--- psdmmenu.cpp 2002/01/28 20:09:48 1.5
***************
*** 1,143 ****
! /*
! * psdsplsh.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdmmenu.h"
!
! //-------------------------------------------------------------------
! bool psdMainMenu::Initialize()
! {
! // determine which background image suitable for the current resolution
! if(width >= 1024 && height >= 768)
! {
! if(!(bg = dmanager->CreateSprite("menu17.gif"))) return false;
! bg->SetTextureRectangle(0,128, 1024, 768);
! }
! else if(width == 800 && height == 600)
! {
! if(!(bg = dmanager->CreateSprite("menu86.gif"))) return false;
! bg->SetTextureRectangle(112,212, 800, 600);
! }
! else
! {
! if(!(bg = dmanager->CreateSprite("menu64.gif"))) return false;
! bg->SetTextureRectangle(192,16, 640, 480);
! }
!
! int halfWidth = width >> 1;
! int halfHeight = height >> 1;
!
!
! // Temp to hold things while we create components.
! psButton* tmp;
! psText* txt;
! csSimplePixmap *up = NULL, *down = NULL;
!
!
! //-- Button 1
! up = dmanager->CreateSprite("iblue_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("iblue_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 0);
! tmp->Initialize(halfWidth -110, halfHeight -60, 46, 102, up,down,
! psdMainMenu::LoadCreateCharacter);
! AddComp(tmp);
!
! txt = new psText(this, 10);
! txt->Initialize((halfWidth-115)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Create");
! AddComp(txt);
!
! //-- Button 2
! up = dmanager->CreateSprite("iyellow_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("iyellow_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 1);
! tmp->Initialize(halfWidth -23, halfHeight -60, 46, 102, up,down,
! psdMainMenu::Quit);
! AddComp(tmp);
!
! txt = new psText(this, 11);
! txt->Initialize((halfWidth-15)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Quit");
! AddComp(txt);
!
!
! //-- Button 3
! up = dmanager->CreateSprite("ired_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("ired_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 2);
! tmp->Initialize(halfWidth +64, halfHeight -60, 46, 102, up,down,
! psdMainMenu::Connect);
! AddComp(tmp);
! txt = new psText(this, 12);
! txt->Initialize((halfWidth+65)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Connect");
! AddComp(txt);
!
!
! return true;
! }
!
!
! //-------------------------------------------------------------------
! void psdMainMenu::LoadCreateCharacter(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->SetVisible("menu", false);
! dialog->GetDialogManager()->SetActive("cc_main");
! }
!
! //-------------------------------------------------------------------
! void psdMainMenu::Connect(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->SetVisible("menu", false);
! dialog->GetDialogManager()->SetActive("connect");
! }
!
! //-------------------------------------------------------------------
! void psdMainMenu::Quit(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->ShutDown();
! }
!
! //-------------------------------------------------------------------
!
--- 1,143 ----
! /*
! * psdsplsh.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdmmenu.h"
!
! //-------------------------------------------------------------------
! bool psdMainMenu::Initialize()
! {
! // determine which background image suitable for the current resolution
! if(width >= 1024 && height >= 768)
! {
! if(!(bg = dmanager->CreateSprite("menu17.gif"))) return false;
! bg->SetTextureRectangle(0,128, 1024, 768);
! }
! else if(width == 800 && height == 600)
! {
! if(!(bg = dmanager->CreateSprite("menu86.gif"))) return false;
! bg->SetTextureRectangle(112,212, 800, 600);
! }
! else
! {
! if(!(bg = dmanager->CreateSprite("menu64.gif"))) return false;
! bg->SetTextureRectangle(192,16, 640, 480);
! }
!
! int halfWidth = width >> 1;
! int halfHeight = height >> 1;
!
!
! // Temp to hold things while we create components.
! psButton* tmp;
! psText* txt;
! csSimplePixmap *up = NULL, *down = NULL;
!
!
! //-- Button 1
! up = dmanager->CreateSprite("iblue_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("iblue_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 0);
! tmp->Initialize(halfWidth -110, halfHeight -60, 46, 102, up,down,
! psdMainMenu::LoadCreateCharacter);
! AddComp(tmp);
!
! txt = new psText(this, 10);
! txt->Initialize((halfWidth-115)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Create");
! AddComp(txt);
!
! //-- Button 2
! up = dmanager->CreateSprite("iyellow_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("iyellow_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 1);
! tmp->Initialize(halfWidth -23, halfHeight -60, 46, 102, up,down,
! psdMainMenu::Quit);
! AddComp(tmp);
!
! txt = new psText(this, 11);
! txt->Initialize((halfWidth-15)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Quit");
! AddComp(txt);
!
!
! //-- Button 3
! up = dmanager->CreateSprite("ired_u.gif");
! up->SetTextureRectangle(42,14,46,102);
! down = dmanager->CreateSprite("ired_d.gif");
! down->SetTextureRectangle(42,14,46,102);
!
! tmp = new psButton(this, 2);
! tmp->Initialize(halfWidth +64, halfHeight -60, 46, 102, up,down,
! psdMainMenu::Connect);
! AddComp(tmp);
! txt = new psText(this, 12);
! txt->Initialize((halfWidth+65)+x, (halfHeight+60)+y, 60, 20);
! txt->SetText("Connect");
! AddComp(txt);
!
!
! return true;
! }
!
!
! //-------------------------------------------------------------------
! void psdMainMenu::LoadCreateCharacter(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->SetVisible("menu", false);
! dialog->GetDialogManager()->SetActive("cc_main");
! }
!
! //-------------------------------------------------------------------
! void psdMainMenu::Connect(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->SetVisible("menu", false);
! dialog->GetDialogManager()->SetActive("connect");
! }
!
! //-------------------------------------------------------------------
! void psdMainMenu::Quit(psDialog* dialog, int )
! {
! dialog->GetDialogManager()->ShutDown();
! }
!
! //-------------------------------------------------------------------
!
Index: psdsplsh.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/psdsplsh.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** psdsplsh.cpp 2002/01/28 03:58:31 1.4
--- psdsplsh.cpp 2002/01/28 20:09:48 1.5
***************
*** 1,86 ****
! /*
! * psdsplsh.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
! #include "cssys/sysfunc.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "psdsplsh.h"
!
! //-------------------------------------------------------------------
!
! bool psdSplash::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("main.jpg"))) return false;
!
! // set the texture to the following
! bg->SetTextureRectangle(192,16, 640, 480);
!
! initialTime = csGetTicks();
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! bool psdSplash::HandleKeyDown(int , char , int )
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! bool psdSplash::HandleMouseUp(int , int , int )
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! void psdSplash::DrawFrame2D()
! {
! psDialog::DrawFrame2D();
!
! csTicks currentTime = csGetTicks();
! if(currentTime - initialTime > 5000)
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
! }
! }
!
! //-------------------------------------------------------------------
--- 1,86 ----
! /*
! * psdsplsh.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
! #include "cssys/sysfunc.h"
!
! // PS include
! #include "dialogls.h"
! #include "psdmngr.h"
! #include "base/psdialog.h"
! #include "psdsplsh.h"
!
! //-------------------------------------------------------------------
!
! bool psdSplash::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("main.jpg"))) return false;
!
! // set the texture to the following
! bg->SetTextureRectangle(192,16, 640, 480);
!
! initialTime = csGetTicks();
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! bool psdSplash::HandleKeyDown(int , char , int )
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! bool psdSplash::HandleMouseUp(int , int , int )
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
!
! return true;
! }
!
! //-------------------------------------------------------------------
!
! void psdSplash::DrawFrame2D()
! {
! psDialog::DrawFrame2D();
!
! csTicks currentTime = csGetTicks();
! if(currentTime - initialTime > 5000)
! {
! dmanager->SetActive("menu");
! dmanager->Destroy("splash");
! }
! }
!
! //-------------------------------------------------------------------
Index: template.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/client/gui/template.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** template.cpp 2001/11/24 16:48:25 1.2
--- template.cpp 2002/01/28 20:09:48 1.3
***************
*** 1,49 ****
! /*
! * template.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psmanage.h"
! #include "base/psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdMyDialog.h"
!
! //-------------------------------------------------------------------
!
! bool psdMyDialog::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("something.gif"))) return false;
!
! return true;
! }
!
! //-------------------------------------------------------------------
--- 1,49 ----
! /*
! * template.cpp
! *
! * Copyright (C) 2001 PlaneShift Team (in...@pl...,
! * http://www.planeshift.it)
! *
! * This program 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 (version 2 of the License)
! * This program 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 this program; if not, write to the Free Software
! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
! *
! *
! */
! #include "config.h"
!
! // CS includes
! #include "cstool/cspixmap.h"
! #include "ivideo/graph3d.h"
! #include "ivideo/graph2d.h"
! #include "ivideo/txtmgr.h"
! #include "ivideo/texture.h"
! #include "ivideo/material.h"
! #include "ivideo/fontserv.h"
!
! // PS include
! #include "dialogls.h"
! #include "psmanage.h"
! #include "base/psdmngr.h"
! #include "base/psdialog.h"
! #include "base/psbutton.h"
! #include "base/pstext.h"
! #include "psdMyDialog.h"
!
! //-------------------------------------------------------------------
!
! bool psdMyDialog::Initialize()
! {
! if(!(bg = dmanager->CreateSprite("something.gif"))) return false;
!
! return true;
! }
!
! //-------------------------------------------------------------------
|