Menu
▾
▴
[Seq-cvs-commit] showeq/src Makefile.am,1.22.6.5,1.22.6.5.2.1 classes.h,1.2.8.2,1.2.8.2.2.1 deity.h,1.1.1.1,1.1.1.1.18.1 languages.h,1.4,1.4.18.1 netdiag.cpp,1.10.6.1,1.10.6.1.2.1 races.h,1.9.8.3,1.9.8.3.2.1 skills.h,1.1.1.1.16.1,1.1.1.1.16.1.2.1 spawn.h,1.19.6.3,1.19.6.3.2.1 staticspells.h,1.1,1.1.16.1 typenames.h,1.4,1.4.8.1 weapons.h,1.5,1.5.8.1 weapons1.h,1.1,1.1.12.1 weapons27.h,1.4,1.4.12.1 weapons28.h,1.1,1.1.18.1 weapons2b.h,1.1,1.1.18.1
|
From: Erik B. <do...@us...> - 2004-10-02 03:09:56
|
Update of /cvsroot/seq/showeq/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1676/src Modified Files: Tag: pre_v5_0_dev2 Makefile.am classes.h deity.h languages.h netdiag.cpp races.h skills.h spawn.h staticspells.h typenames.h weapons.h weapons1.h weapons27.h weapons28.h weapons2b.h Log Message: Doxygen support and a couple bug fixes/robustness modifications. Index: weapons.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons.h,v retrieving revision 1.5 retrieving revision 1.5.8.1 diff -u -d -r1.5 -r1.5.8.1 --- weapons.h 25 Oct 2003 00:21:00 -0000 1.5 +++ weapons.h 2 Oct 2004 03:09:41 -0000 1.5.8.1 @@ -4,7 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ - "Generic", // 0x00 + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Generic", // 0x00 "1HSword", // 0x01 "2HSword", // 0x02 "Axe", // 0x03 @@ -260,4 +261,5 @@ NULL, // 0xfd - Unknown Weapon NULL, // 0xfe - Unknown Weapon NULL, // 0xff - Unknown Weapon +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ Index: staticspells.h =================================================================== RCS file: /cvsroot/seq/showeq/src/staticspells.h,v retrieving revision 1.1 retrieving revision 1.1.16.1 diff -u -d -r1.1 -r1.1.16.1 --- staticspells.h 29 Sep 2003 00:51:03 -0000 1.1 +++ staticspells.h 2 Oct 2004 03:09:41 -0000 1.1.16.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* File autogenerated from spells_en.txt */ // Format: // /* Spell ID */ { Spell Name }, @@ -4431,3 +4432,5 @@ // Max SpellId: 0x1142 = 4418 // Number of Spells: 4293 // Empty Entries: 125 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: Makefile.am =================================================================== RCS file: /cvsroot/seq/showeq/src/Makefile.am,v retrieving revision 1.22.6.5 retrieving revision 1.22.6.5.2.1 diff -u -d -r1.22.6.5 -r1.22.6.5.2.1 --- Makefile.am 24 Sep 2004 04:25:51 -0000 1.22.6.5 +++ Makefile.am 2 Oct 2004 03:09:41 -0000 1.22.6.5.2.1 @@ -73,7 +73,7 @@ $(MOC) -nw $< -o $@ s_%.h: %.h - ./h2info.pl $< $@ + $(srcdir)/h2info.pl $< $@ ui_%.h: %.ui $(UIC) -nounload $< > $@ Index: weapons28.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons28.h,v retrieving revision 1.1 retrieving revision 1.1.18.1 diff -u -d -r1.1 -r1.1.18.1 --- weapons28.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons28.h 2 Oct 2004 03:09:41 -0000 1.1.18.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: spawn.h =================================================================== RCS file: /cvsroot/seq/showeq/src/spawn.h,v retrieving revision 1.19.6.3 retrieving revision 1.19.6.3.2.1 diff -u -d -r1.19.6.3 -r1.19.6.3.2.1 --- spawn.h 24 Sep 2004 04:25:53 -0000 1.19.6.3 +++ spawn.h 2 Oct 2004 03:09:41 -0000 1.19.6.3.2.1 @@ -428,16 +428,16 @@ { // if this is an item of spawn type, return the pointer to Spawn, // return otherwise NULL - if (!item || (item->type() == tSpawn)) - return NULL; // otherwise NULL - else + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (const Spawn*)item; + else + return NULL; // otherwise NULL } inline Spawn* spawnType(Item* item) { // if this is an item of spawn type, return the pointer to Spawn - if (item->type() == tSpawn) + if (item && ((item->type() == tSpawn) || (item->type() == tPlayer))) return (Spawn*)item; else return NULL; // otherwise NULL @@ -447,7 +447,7 @@ inline const Door* doorType(const Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (const Door*)item; else return NULL; // otherwise NULL @@ -456,7 +456,7 @@ inline Door* doorType(Item* item) { // if this is an item of door type, return the pointer to Door - if (item->type() == tDoors) + if (item && (item->type() == tDoors)) return (Door*)item; else return NULL; // otherwise NULL @@ -466,7 +466,7 @@ inline const Drop* dropType(const Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (const Drop*)item; else return NULL; // otherwise NULL @@ -475,7 +475,7 @@ inline Drop* dropType(Item* item) { // if this is an item of drop type, return the pointer to Drop - if (item->type() == tDrop) + if (item && (item->type() == tDrop)) return (Drop*)item; else return NULL; // otherwise NULL Index: weapons27.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons27.h,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -u -d -r1.4 -r1.4.12.1 --- weapons27.h 7 Oct 2003 14:34:29 -0000 1.4 +++ weapons27.h 2 Oct 2004 03:09:41 -0000 1.4.12.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: skills.h =================================================================== RCS file: /cvsroot/seq/showeq/src/skills.h,v retrieving revision 1.1.1.1.16.1 retrieving revision 1.1.1.1.16.1.2.1 diff -u -d -r1.1.1.1.16.1 -r1.1.1.1.16.1.2.1 --- skills.h 18 Feb 2004 22:56:15 -0000 1.1.1.1.16.1 +++ skills.h 2 Oct 2004 03:09:41 -0000 1.1.1.1.16.1.2.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS "1H Blunt", // 0 "1H Slashing", // 1 "2H Blunt", // 2 @@ -79,3 +81,5 @@ "Berserking", // 72 "Taunt", // 73 "Frenzy", // 74 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: typenames.h =================================================================== RCS file: /cvsroot/seq/showeq/src/typenames.h,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -u -d -r1.4 -r1.4.8.1 --- typenames.h 25 Oct 2003 00:21:00 -0000 1.4 +++ typenames.h 2 Oct 2004 03:09:41 -0000 1.4.8.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 "Humanoid", // 1 NULL, // 2 @@ -73,3 +75,5 @@ "Timer", // 66 "EventTrigger", // 67 NULL, // 68 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: weapons2b.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons2b.h,v retrieving revision 1.1 retrieving revision 1.1.18.1 diff -u -d -r1.1 -r1.1.18.1 --- weapons2b.h 30 Dec 2001 07:18:55 -0000 1.1 +++ weapons2b.h 2 Oct 2004 03:09:41 -0000 1.1.18.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: races.h =================================================================== RCS file: /cvsroot/seq/showeq/src/races.h,v retrieving revision 1.9.8.3 retrieving revision 1.9.8.3.2.1 diff -u -d -r1.9.8.3 -r1.9.8.3.2.1 --- races.h 18 Sep 2004 20:51:32 -0000 1.9.8.3 +++ races.h 2 Oct 2004 03:09:41 -0000 1.9.8.3.2.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0 - Unknown Race "Human", // 1 "Barbarian", // 2 @@ -424,3 +426,5 @@ "Gelidran", // 417 "Discordling", // 418 "Girplan", // 419 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: weapons1.h =================================================================== RCS file: /cvsroot/seq/showeq/src/weapons1.h,v retrieving revision 1.1 retrieving revision 1.1.12.1 diff -u -d -r1.1 -r1.1.12.1 --- weapons1.h 7 Oct 2003 14:34:29 -0000 1.1 +++ weapons1.h 2 Oct 2004 03:09:41 -0000 1.1.12.1 @@ -4,6 +4,8 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ + +#ifndef DOXYGEN_SHOULD_SKIP_THIS NULL, // 0x00 NULL, // 0x01 NULL, // 0x02 @@ -277,3 +279,5 @@ NULL, // 0xfd NULL, // 0xfe NULL, // 0xff +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: deity.h =================================================================== RCS file: /cvsroot/seq/showeq/src/deity.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.18.1 diff -u -d -r1.1.1.1 -r1.1.1.1.18.1 --- deity.h 19 Dec 2001 00:36:52 -0000 1.1.1.1 +++ deity.h 2 Oct 2004 03:09:41 -0000 1.1.1.1.18.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Bertoxxulous", // DEITY_BERT = 201 "Brell Serilis", // DEITY_BRELL = 202 "Cazic Thule", // DEITY_CAZIC = 203 @@ -21,3 +22,5 @@ "The Tribunal", // DEITY_TRIBUNAL = 214 "Tunare", // DEITY_TUNARE = 215 "Veeshan", // DEITY_VEESHAN = 216 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: classes.h =================================================================== RCS file: /cvsroot/seq/showeq/src/classes.h,v retrieving revision 1.2.8.2 retrieving revision 1.2.8.2.2.1 diff -u -d -r1.2.8.2 -r1.2.8.2.2.1 --- classes.h 12 Feb 2004 00:39:28 -0000 1.2.8.2 +++ classes.h 2 Oct 2004 03:09:41 -0000 1.2.8.2.2.1 @@ -4,6 +4,7 @@ * ShowEQ Distributed under GPL * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS /* Maps class numbers to strings, included from util.cpp */ "0", // 0 is unknown @@ -69,3 +70,5 @@ "LDoN Recruiter", // 60 "LDoN Merchant", // 61 "LDoN Object", // 62 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + Index: netdiag.cpp =================================================================== RCS file: /cvsroot/seq/showeq/src/netdiag.cpp,v retrieving revision 1.10.6.1 retrieving revision 1.10.6.1.2.1 diff -u -d -r1.10.6.1 -r1.10.6.1.2.1 --- netdiag.cpp 7 Dec 2003 06:30:43 -0000 1.10.6.1 +++ netdiag.cpp 2 Oct 2004 03:09:41 -0000 1.10.6.1.2.1 @@ -195,7 +195,7 @@ m_seqExp[stream]->setText(disp); } -void NetDiag::clientChanged(uint32_t addr) +void NetDiag::clientChanged(in_addr_t addr) { QString disp, tmp; disp = print_addr(addr); @@ -219,7 +219,7 @@ m_clientLabel->setText(disp); } -void NetDiag::clientPortLatched(uint16_t clientPort) +void NetDiag::clientPortLatched(in_port_t clientPort) { QString disp, tmp; uint32_t addr = m_packet->clientAddr(); @@ -232,7 +232,7 @@ m_clientLabel->setText(disp); } -void NetDiag::serverPortLatched(uint16_t port) +void NetDiag::serverPortLatched(in_port_t port) { m_serverPortLabel->setText(QString::number(port)); } Index: languages.h =================================================================== RCS file: /cvsroot/seq/showeq/src/languages.h,v retrieving revision 1.4 retrieving revision 1.4.18.1 diff -u -d -r1.4 -r1.4.18.1 --- languages.h 11 May 2002 17:16:06 -0000 1.4 +++ languages.h 2 Oct 2004 03:09:41 -0000 1.4.18.1 @@ -5,6 +5,7 @@ * http://seq.sourceforge.net/ */ +#ifndef DOXYGEN_SHOULD_SKIP_THIS "Common Tongue", // 0 "Barbarian", // 1 "Erudian", // 2 @@ -30,3 +31,5 @@ "Elder Dragon", // 22 "Dark Speech", // 23 "Van Shir", // 24 +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + |
