[Sphere-axis-commits] CVS: Axis Axis.txt,1.21,1.22 drewsky.rc,1.28,1.29 generaltab.cpp,1.5,1.6 gener
Brought to you by:
pesterle
Menu
▾
▴
[Sphere-axis-commits] CVS: Axis Axis.txt,1.21,1.22 drewsky.rc,1.28,1.29 generaltab.cpp,1.5,1.6 generaltab.h,1.3,1.4 MISCTAB.CPP,1.8,1.9 MISCTAB.H,1.3,1.4 resource.h,1.22,1.23 SPAWNTAB.CPP,1.9,1.10 SPAWNTAB.H,1.4,1.5
Update of /cvsroot/sphere-axis/Axis
In directory usw-pr-cvs1:/tmp/cvs-serv8069
Modified Files:
Axis.txt drewsky.rc generaltab.cpp generaltab.h MISCTAB.CPP
MISCTAB.H resource.h SPAWNTAB.CPP SPAWNTAB.H
Log Message:
Patch Tracker 553591 - New Command and minor UI Tweaks, submitted by
Piotr Banasik
Index: Axis.txt
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/Axis.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Axis.txt 8 May 2002 03:40:15 -0000 1.21
--- Axis.txt 8 May 2002 15:44:18 -0000 1.22
***************
*** 25,28 ****
--- 25,30 ----
=============================================================================
Changes in version 0.13b (in development)
+ · Minor UI tweaks (details can be found in patch tracker #553591, submitted by
+ Piotr Banasik).
· Fixed bug where blockIP and UnblockIP weren't working with newer Sphere versions.
· Checked to make sure hues were loaded before trying to draw the palette bitmap
Index: drewsky.rc
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/drewsky.rc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** drewsky.rc 8 May 2002 03:40:15 -0000 1.28
--- drewsky.rc 8 May 2002 15:44:18 -0000 1.29
***************
*** 1,4 ****
//Microsoft Developer Studio generated resource script.
! // Last compiled 5/7/2002 at 21:38:0
#include "resource.h"
--- 1,4 ----
//Microsoft Developer Studio generated resource script.
! //
#include "resource.h"
***************
*** 106,114 ****
PUSHBUTTON "Invulnerable",IDC_INVULNERABLE,11,11,42,14
PUSHBUTTON "Allmove",IDC_SETALLMOVE,11,26,42,14
! PUSHBUTTON "Invisible",IDC_INVISIBLE,11,41,42,14
PUSHBUTTON "Fix",IDC_FIX,11,55,42,14
PUSHBUTTON "Hear All",IDC_SETHEARALL,57,11,42,14
PUSHBUTTON "GM Toggle",IDC_GMTOGGLE,57,26,42,14
! PUSHBUTTON "Detail",IDC_SETDETAIL,57,41,42,14
PUSHBUTTON "Clients",IDC_CLIENTS,109,11,43,15
PUSHBUTTON "Server Info",IDC_SERVERINFO,109,26,43,15
--- 106,114 ----
PUSHBUTTON "Invulnerable",IDC_INVULNERABLE,11,11,42,14
PUSHBUTTON "Allmove",IDC_SETALLMOVE,11,26,42,14
! PUSHBUTTON "Invisible",IDC_INVISIBLE,11,41,42,13
PUSHBUTTON "Fix",IDC_FIX,11,55,42,14
PUSHBUTTON "Hear All",IDC_SETHEARALL,57,11,42,14
PUSHBUTTON "GM Toggle",IDC_GMTOGGLE,57,26,42,14
! PUSHBUTTON "Detail",IDC_SETDETAIL,57,41,42,13
PUSHBUTTON "Clients",IDC_CLIENTS,109,11,43,15
PUSHBUTTON "Server Info",IDC_SERVERINFO,109,26,43,15
***************
*** 146,152 ****
PUSHBUTTON "Go Origin",IDC_PAGEORIGIN,396,43,43,15
PUSHBUTTON "Go Player",IDC_PAGEPLAYER,396,59,43,15
! PUSHBUTTON "List",IDC_PAGELIST,396,75,43,15
! PUSHBUTTON "Jail",IDC_PAGEJAIL,443,11,43,15
! PUSHBUTTON "Kick",IDC_PAGEKICK,443,27,43,15
PUSHBUTTON "Disconnect",IDC_PAGEDISCONNECT,443,43,43,15
PUSHBUTTON "Queue",IDC_PAGEQUEUE,443,59,43,15
--- 146,152 ----
PUSHBUTTON "Go Origin",IDC_PAGEORIGIN,396,43,43,15
PUSHBUTTON "Go Player",IDC_PAGEPLAYER,396,59,43,15
! PUSHBUTTON "List",IDC_PAGELIST,443,11,43,15
! PUSHBUTTON "Jail",IDC_PAGEJAIL,443,27,43,15
! PUSHBUTTON "Ban",IDC_PAGEKICK,396,75,43,15
PUSHBUTTON "Disconnect",IDC_PAGEDISCONNECT,443,43,43,15
PUSHBUTTON "Queue",IDC_PAGEQUEUE,443,59,43,15
***************
*** 156,160 ****
GROUPBOX "World",IDC_STATIC,156,2,143,105
GROUPBOX "GM Page",IDC_STATIC,392,2,98,93
! GROUPBOX "PC/NPC",IDC_STATIC,300,2,46,105
CTEXT "00",IDC_SLIDERVALUE,267,90,17,10,SS_CENTERIMAGE |
SS_SUNKEN
--- 156,160 ----
GROUPBOX "World",IDC_STATIC,156,2,143,105
GROUPBOX "GM Page",IDC_STATIC,392,2,98,93
! GROUPBOX "PC/NPC",IDC_STATIC,301,2,46,105
CTEXT "00",IDC_SLIDERVALUE,267,90,17,10,SS_CENTERIMAGE |
SS_SUNKEN
***************
*** 165,170 ****
PUSHBUTTON "Block",IDC_BLOCK,66,80,31,11
PUSHBUTTON "UnBlock",IDC_UNBLOCK,66,93,31,11
- PUSHBUTTON "Underwear",IDC_UNDERWEAR,57,55,42,14
PUSHBUTTON "Restock",IDC_XRESTOCK,352,56,35,15
END
--- 165,170 ----
PUSHBUTTON "Block",IDC_BLOCK,66,80,31,11
PUSHBUTTON "UnBlock",IDC_UNBLOCK,66,93,31,11
PUSHBUTTON "Restock",IDC_XRESTOCK,352,56,35,15
+ PUSHBUTTON "NightSight",IDC_NIGHTSIGHT,57,55,42,14
END
***************
*** 317,325 ****
PUSHBUTTON "Remove",IDC_SPREMOVE,43,95,33,13
PUSHBUTTON "Set Home",IDC_SETHOME,79,95,37,13
! PUSHBUTTON "Set Homedist",IDC_SETHOMEDIST,123,95,46,13
! EDITTEXT IDC_HOMEDIST,169,95,20,13,ES_AUTOHSCROLL | ES_NUMBER
! PUSHBUTTON "Freeze",IDC_SPFREEZE,201,95,26,13
! PUSHBUTTON "Kill",IDC_STKILL,227,95,23,13
! PUSHBUTTON "Find",IDC_FINDNPC,253,95,33,13
EDITTEXT IDC_AMOUNT,324,11,26,12,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_MIN_TIME,324,25,26,12,ES_AUTOHSCROLL | ES_NUMBER
--- 317,325 ----
PUSHBUTTON "Remove",IDC_SPREMOVE,43,95,33,13
PUSHBUTTON "Set Home",IDC_SETHOME,79,95,37,13
! PUSHBUTTON "Set Homedist",IDC_SETHOMEDIST,120,95,46,13
! EDITTEXT IDC_HOMEDIST,166,95,20,13,ES_AUTOHSCROLL | ES_NUMBER
! PUSHBUTTON "Freeze",IDC_SPFREEZE,215,95,26,13
! PUSHBUTTON "Kill",IDC_STKILL,243,95,18,13
! PUSHBUTTON "Find",IDC_FINDNPC,263,95,23,13
EDITTEXT IDC_AMOUNT,324,11,26,12,ES_AUTOHSCROLL | ES_NUMBER
EDITTEXT IDC_MIN_TIME,324,25,26,12,ES_AUTOHSCROLL | ES_NUMBER
***************
*** 337,340 ****
--- 337,341 ----
CONTROL "",IDC_NPCDISPLAY,"{0904F7B3-2339-44C9-857C-6EB6CFEFA3B6}",
WS_TABSTOP,355,2,131,106
+ PUSHBUTTON "Shrink",IDC_SHRINK,190,95,23,13
END
***************
*** 590,593 ****
--- 591,595 ----
PUSHBUTTON "Start Sphere Server",IDC_STARTTUS,222,27,77,14
PUSHBUTTON "Export Categories",IDC_EXPORTCATS,222,41,77,14
+ PUSHBUTTON "Underwear",IDC_UNDERWEAR2,349,72,40,14
END
Index: generaltab.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/generaltab.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** generaltab.cpp 8 May 2002 02:04:33 -0000 1.5
--- generaltab.cpp 8 May 2002 15:44:18 -0000 1.6
***************
*** 22,25 ****
--- 22,40 ----
*/
+
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + Removed the Underwear Button from this form (who uses it that
+ * often anyways
+ * + Added NightSight Button in place of the Underwear button
+ * + Rearranged the buttons on the GM Page tab a little bit
+ * Split off Disconnect and Kick, and renamed Kick to Ban
+ * (Adjusted the confirmation box to say Ban aswell)
+ * + minor tweaks to make buttons not touch
+ *
+ **********************************************************************/
+
+
// GeneralTab.cpp : implementation file
//
***************
*** 114,118 ****
ON_BN_CLICKED(IDC_BLOCK, OnBlock)
ON_BN_CLICKED(IDC_UNBLOCK, OnUnblock)
! ON_BN_CLICKED(IDC_UNDERWEAR, OnUnderwear)
ON_BN_CLICKED(IDC_XRESTOCK, OnXrestock)
//}}AFX_MSG_MAP
--- 129,133 ----
ON_BN_CLICKED(IDC_BLOCK, OnBlock)
ON_BN_CLICKED(IDC_UNBLOCK, OnUnblock)
! ON_BN_CLICKED(IDC_NIGHTSIGHT, OnNightsight)
ON_BN_CLICKED(IDC_XRESTOCK, OnXrestock)
//}}AFX_MSG_MAP
***************
*** 280,285 ****
void CGeneralTab::OnPagekick()
{
! if (AfxMessageBox("Are you sure you wish to kick the client that sent this page?", MB_OKCANCEL | MB_ICONQUESTION) == IDOK)
! SendToUO((CString)".page kick");
}
--- 295,300 ----
void CGeneralTab::OnPagekick()
{
! if (AfxMessageBox("Are you sure you wish to BAN the client that sent this page?", MB_OKCANCEL | MB_ICONQUESTION) == IDOK)
! SendToUO((CString)".page ban");
}
***************
*** 421,431 ****
}
! void CGeneralTab::OnUnderwear()
{
! SendToUO(".underwear");
}
! void CGeneralTab::OnXrestock()
{
! SendToUO(".xrestock");
}
--- 436,446 ----
}
! void CGeneralTab::OnXrestock()
{
! SendToUO(".xrestock");
}
! void CGeneralTab::OnNightsight()
{
! SendToUO(".nightsight");
}
Index: generaltab.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/generaltab.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** generaltab.h 1 May 2002 03:33:11 -0000 1.3
--- generaltab.h 8 May 2002 15:44:18 -0000 1.4
***************
*** 22,25 ****
--- 22,39 ----
*/
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + Removed the Underwear Button from this form (who uses it that
+ * often anyways
+ * + Added NightSight Button in place of the Underwear button
+ * + Rearranged the buttons on the GM Page tab a little bit
+ * Split off Disconnect and Kick, and renamed Kick to Ban
+ * (Adjusted the confirmation box to say Ban aswell)
+ * + minor tweaks to make buttons not touch
+ *
+ **********************************************************************/
+
+
#if !defined(AFX_GENERALTAB_H__DFB29CF4_D431_11D2_A613_004F4905E937__INCLUDED_)
#define AFX_GENERALTAB_H__DFB29CF4_D431_11D2_A613_004F4905E937__INCLUDED_
***************
*** 114,119 ****
afx_msg void OnBlock();
afx_msg void OnUnblock();
- afx_msg void OnUnderwear();
afx_msg void OnXrestock();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
--- 128,133 ----
afx_msg void OnBlock();
afx_msg void OnUnblock();
afx_msg void OnXrestock();
+ afx_msg void OnNightsight();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: MISCTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.CPP,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** MISCTAB.CPP 6 May 2002 04:11:10 -0000 1.8
--- MISCTAB.CPP 8 May 2002 15:44:18 -0000 1.9
***************
*** 22,25 ****
--- 22,34 ----
*/
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + The Underwear button that was removed from General tab
+ * was moved here
+ *
+ **********************************************************************/
+
+
// MiscTab.cpp : implementation file
//
***************
*** 687,690 ****
--- 696,700 ----
ON_BN_CLICKED(IDC_STARTTUS, OnStarttus)
ON_BN_CLICKED(IDC_EXPORTCATS, OnExportcats)
+ ON_BN_CLICKED(IDC_UNDERWEAR2, OnUnderwear2)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 1196,1198 ****
--- 1206,1213 ----
csfOutput.Close();
+ }
+
+ void CMiscTab::OnUnderwear2()
+ {
+ SendToUO(".underwear");
}
Index: MISCTAB.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/MISCTAB.H,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MISCTAB.H 1 May 2002 03:33:10 -0000 1.3
--- MISCTAB.H 8 May 2002 15:44:18 -0000 1.4
***************
*** 22,25 ****
--- 22,34 ----
*/
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + The Underwear button that was removed from General tab
+ * was moved here
+ *
+ **********************************************************************/
+
+
#if !defined(AFX_MISCTAB_H__DFB29CF9_D431_11D2_A613_004F4905E937__INCLUDED_)
#define AFX_MISCTAB_H__DFB29CF9_D431_11D2_A613_004F4905E937__INCLUDED_
***************
*** 97,100 ****
--- 106,110 ----
afx_msg void OnStarttus();
afx_msg void OnExportcats();
+ afx_msg void OnUnderwear2();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: resource.h
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/resource.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** resource.h 2 May 2002 22:19:57 -0000 1.22
--- resource.h 8 May 2002 15:44:18 -0000 1.23
***************
*** 270,273 ****
--- 270,274 ----
#define IDC_CUSTOM_CMD_15 1015
#define IDC_RC_ACCOUNT 1015
+ #define IDC_UNDERWEAR2 1015
#define IDC_BUTTON16 1016
#define IDC_NUKE 1016
Index: SPAWNTAB.CPP
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.CPP,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** SPAWNTAB.CPP 6 May 2002 04:11:10 -0000 1.9
--- SPAWNTAB.CPP 8 May 2002 15:44:18 -0000 1.10
***************
*** 22,25 ****
--- 22,33 ----
*/
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + Added a shrink button
+ * + Rearranged a fair bit on the bottom to make it fit
+ *
+ **********************************************************************/
+
// SpawnTab.cpp : implementation file
//
***************
*** 100,103 ****
--- 108,112 ----
ON_EN_CHANGE(IDC_MAX_TIME, OnChangeParams)
ON_EN_CHANGE(IDC_MAX_DIST, OnChangeParams)
+ ON_BN_CLICKED(IDC_SHRINK, OnShrink)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 714,716 ****
Find("", m_iSearchCrit, true);
return;
! }
\ No newline at end of file
--- 723,730 ----
Find("", m_iSearchCrit, true);
return;
! }
!
! void CSpawnTab::OnShrink()
! {
! SendToUO(".shrink");
! }
Index: SPAWNTAB.H
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/SPAWNTAB.H,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** SPAWNTAB.H 1 May 2002 03:33:10 -0000 1.4
--- SPAWNTAB.H 8 May 2002 15:44:18 -0000 1.5
***************
*** 22,25 ****
--- 22,34 ----
*/
+ /**********************************************************************
+ * Changes:
+ * - 7 May 2002 - PiotrBanasik
+ * + Added a shrink button
+ * + Rearranged a fair bit on the bottom to make it fit
+ *
+ **********************************************************************/
+
+
//{{AFX_INCLUDES()
#include "uoart.h"
***************
*** 106,109 ****
--- 115,119 ----
afx_msg void OnStkill();
afx_msg void OnChangeParams();
+ afx_msg void OnShrink();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
|
