Skip to content

Commit ad40ab0

Browse files
author
Snowy
committed
DNA: Remove typedef reference
1 parent d59d2a8 commit ad40ab0

File tree

8 files changed

+34
-36
lines changed

8 files changed

+34
-36
lines changed

‎panda/src/toontown/dna/dnaGroup.I‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Access: Public
1111
// Description: Return the nth group in the vector
1212
////////////////////////////////////////////////////////////////////
13-
INLINE PT(DNAGroup) DNAGroup::at(uint index) {
13+
INLINE PT(DNAGroup) DNAGroup::at(unsigned int index) {
1414
nassertr(index < _group_vector.size(), (PT(DNAGroup))nullptr);
1515
return _group_vector[index];
1616
}

‎panda/src/toontown/dna/dnaGroup.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class EXPCL_TOONTOWN DNAGroup : public TypedReferenceCount, public Namable {
3636

3737
void add(PT(DNAGroup) group);
3838
void remove(PT(DNAGroup) group);
39-
INLINE PT(DNAGroup) at(uint index);
39+
INLINE PT(DNAGroup) at(unsigned int index);
4040
INLINE PT(DNAGroup) current();
4141
INLINE int get_num_children();
4242
INLINE PT(DNAGroup) get_parent() const;

‎panda/src/toontown/dna/dnaLexerDefs.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
#include "toontownbase.h"
1010

11-
#include "typedef.h"
12-
1311
#include <string>
1412

1513
void dna_init_lexer(std::istream &in, std::ostream &err, const std::string &filename);

‎panda/src/toontown/dna/dnaStorage.I‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ INLINE int DNAStorage::get_num_DNAVisGroupsAI() const {
215215
// Access: Public
216216
// Description: Return the ith vis group in our storage
217217
////////////////////////////////////////////////////////////////////
218-
INLINE PT(DNAVisGroup) DNAStorage::get_DNAVisGroupAI(uint i) const {
218+
INLINE PT(DNAVisGroup) DNAStorage::get_DNAVisGroupAI(unsigned int i) const {
219219
nassertr(i < _vis_group_vector.size(), (DNAVisGroup *)NULL);
220220
return _vis_group_vector[i];
221221
}

‎panda/src/toontown/dna/dnaStorage.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@ int DNAStorage::get_num_block_numbers() const {
424424
// Access: Public
425425
// Description: Get key at index
426426
////////////////////////////////////////////////////////////////////
427-
int DNAStorage::get_block_number_at(uint index) const {
427+
int DNAStorage::get_block_number_at(unsigned int index) const {
428428
nassertr(index < _block_map.size(), 0);
429429

430-
uint current = 0;
430+
unsigned int current = 0;
431431

432432
// Loop over the map entries:
433433
for(BlockToZoneMap::const_iterator it = _block_map.begin();
@@ -493,10 +493,10 @@ int DNAStorage::get_num_block_door_pos_hprs() const {
493493
// Access: Public
494494
// Description: Get key at index
495495
////////////////////////////////////////////////////////////////////
496-
int DNAStorage::get_door_pos_hpr_block_at(uint index) const {
496+
int DNAStorage::get_door_pos_hpr_block_at(unsigned int index) const {
497497
nassertr(index < _block_door_pos_hpr_map.size(), 0);
498498

499-
uint current = 0;
499+
unsigned int current = 0;
500500

501501
// Loop over the map entries:
502502
for(BlockToPosHprMap::const_iterator it = _block_door_pos_hpr_map.begin();
@@ -560,10 +560,10 @@ int DNAStorage::get_num_block_sign_transforms() const {
560560
// Access: Public
561561
// Description: Get key at index
562562
////////////////////////////////////////////////////////////////////
563-
int DNAStorage::get_sign_transform_block_at(uint index) const {
563+
int DNAStorage::get_sign_transform_block_at(unsigned int index) const {
564564
nassertr(index < _block_sign_transform_map.size(), 0);
565565

566-
uint current = 0;
566+
unsigned int current = 0;
567567

568568
// Loop over the map entries:
569569
for(BlockToTransformMap::const_iterator it = _block_sign_transform_map.begin();
@@ -687,10 +687,10 @@ int DNAStorage::get_num_block_titles() const {
687687
// Access: Public
688688
// Description: Get key at index
689689
////////////////////////////////////////////////////////////////////
690-
int DNAStorage::get_title_block_at(uint index) const {
690+
int DNAStorage::get_title_block_at(unsigned int index) const {
691691
nassertr(index < _block_title_map.size(), 0);
692692

693-
uint current = 0;
693+
unsigned int current = 0;
694694

695695
// Loop over the map entries:
696696
for(BlockToTitleMap::const_iterator it = _block_title_map.begin();
@@ -1151,10 +1151,10 @@ PT(DNAVisGroup) DNAStorage::find_DNAVisGroup(PT(PandaNode) rr) const {
11511151
// Access: Public
11521152
// Description: Return the ith vis group in our storage
11531153
////////////////////////////////////////////////////////////////////
1154-
PT(DNAVisGroup) DNAStorage::get_DNAVisGroup(uint i) const {
1154+
PT(DNAVisGroup) DNAStorage::get_DNAVisGroup(unsigned int i) const {
11551155
nassertr(i < _n2visgroup_map.size(), (DNAVisGroup *)NULL);
11561156

1157-
uint current = 0;
1157+
unsigned int current = 0;
11581158

11591159
// Loop over the vis groups
11601160
for(Node2VisGroupMap::const_iterator it = _n2visgroup_map.begin();
@@ -1179,7 +1179,7 @@ PT(DNAVisGroup) DNAStorage::get_DNAVisGroup(uint i) const {
11791179
// Access: Public
11801180
// Description: Ask how many visibles there are in this visgroup
11811181
////////////////////////////////////////////////////////////////////
1182-
int DNAStorage::get_num_visibles_in_DNAVisGroup(uint i) const {
1182+
int DNAStorage::get_num_visibles_in_DNAVisGroup(unsigned int i) const {
11831183
PT(DNAVisGroup) group;
11841184
group = get_DNAVisGroup(i);
11851185
if (group != (DNAVisGroup *)NULL) {
@@ -1199,7 +1199,7 @@ int DNAStorage::get_num_visibles_in_DNAVisGroup(uint i) const {
11991199
// Access: Public
12001200
// Description: Ask for the name of the nth DNAVisGroup in the map
12011201
////////////////////////////////////////////////////////////////////
1202-
std::string DNAStorage::get_DNAVisGroup_name(uint i) const {
1202+
std::string DNAStorage::get_DNAVisGroup_name(unsigned int i) const {
12031203
PT(DNAVisGroup) group;
12041204
group = get_DNAVisGroup(i);
12051205
if (group != (DNAVisGroup *)NULL) {
@@ -1219,7 +1219,7 @@ std::string DNAStorage::get_DNAVisGroup_name(uint i) const {
12191219
// Access: Public
12201220
// Description: Ask for the name of the nth visible in the nth DNAVisGroup
12211221
////////////////////////////////////////////////////////////////////
1222-
std::string DNAStorage::get_visible_name(uint visgroup_index, uint visible_index) const {
1222+
std::string DNAStorage::get_visible_name(unsigned int visgroup_index, unsigned int visible_index) const {
12231223
PT(DNAVisGroup) group;
12241224
group = get_DNAVisGroup(visgroup_index);
12251225
if (group != (DNAVisGroup *)NULL) {
@@ -1252,10 +1252,10 @@ void DNAStorage::store_DNAVisGroupAI(PT(DNAVisGroup) vis_group) {
12521252
// Access: Public
12531253
// Description: return the ith NodePath
12541254
////////////////////////////////////////////////////////////////////
1255-
PT(PandaNode) DNAStorage::get_PandaNode_at(uint i) const {
1255+
PT(PandaNode) DNAStorage::get_PandaNode_at(unsigned int i) const {
12561256
nassertr(i < _n2group_map.size(), (PandaNode *)NULL);
12571257

1258-
uint current = 0;
1258+
unsigned int current = 0;
12591259

12601260
// Loop over the PandaNodes
12611261
for(Node2GroupMap::const_iterator it = _n2group_map.begin();

‎panda/src/toontown/dna/dnaStorage.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,24 +146,24 @@ class EXPCL_TOONTOWN DNAStorage {
146146

147147
// Block number functions
148148
int get_zone_from_block_number(int block_number) const;
149-
int get_block_number_at(uint index) const;
149+
int get_block_number_at(unsigned int index) const;
150150
int get_num_block_numbers() const;
151151

152152
// Block door pos hpr functions
153153
const PosHpr& get_door_pos_hpr_from_block_number(int block_number) const;
154-
int get_door_pos_hpr_block_at(uint index) const;
154+
int get_door_pos_hpr_block_at(unsigned int index) const;
155155
int get_num_block_door_pos_hprs() const;
156156

157157
// Block sign pos hpr functions
158158
const LMatrix4f& get_sign_transform_from_block_number(int block_number) const;
159-
int get_sign_transform_block_at(uint index) const;
159+
int get_sign_transform_block_at(unsigned int index) const;
160160
int get_num_block_sign_transforms() const;
161161

162162
INLINE void reset_DNAGroups();
163163

164164
// Block title functions
165165
std::string get_title_from_block_number(int block_number) const;
166-
int get_title_block_at(uint index) const;
166+
int get_title_block_at(unsigned int index) const;
167167
int get_num_block_titles() const;
168168

169169
// Block article functions
@@ -179,20 +179,20 @@ class EXPCL_TOONTOWN DNAStorage {
179179
PT(DNAVisGroup) find_DNAVisGroup(PT(PandaNode)) const;
180180
INLINE void reset_DNAVisGroups();
181181
INLINE int get_num_DNAVisGroups() const;
182-
PT(DNAVisGroup) get_DNAVisGroup(uint i) const;
183-
int get_num_visibles_in_DNAVisGroup(uint i) const;
184-
std::string get_DNAVisGroup_name(uint i) const;
185-
std::string get_visible_name(uint visgroup_index, uint visible_index) const;
182+
PT(DNAVisGroup) get_DNAVisGroup(unsigned int i) const;
183+
int get_num_visibles_in_DNAVisGroup(unsigned int i) const;
184+
std::string get_DNAVisGroup_name(unsigned int i) const;
185+
std::string get_visible_name(unsigned int visgroup_index, unsigned int visible_index) const;
186186

187187
// For the AI, he does not traverse but still needs vis groups
188188
void store_DNAVisGroupAI(PT(DNAVisGroup));
189189
INLINE int get_num_DNAVisGroupsAI() const;
190-
INLINE PT(DNAVisGroup) get_DNAVisGroupAI(uint i) const;
190+
INLINE PT(DNAVisGroup) get_DNAVisGroupAI(unsigned int i) const;
191191
INLINE void reset_DNAVisGroupsAI();
192192

193193
// Node relation functions
194194
INLINE int get_num_PandaNodes() const;
195-
PT(PandaNode) get_PandaNode_at(uint i) const;
195+
PT(PandaNode) get_PandaNode_at(unsigned int i) const;
196196
void print_PandaNodes() const;
197197

198198
// Suit point functions

‎panda/src/toontown/dna/dnaVisGroup.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int DNAVisGroup::get_num_visibles() const {
9191
// Access: Public
9292
// Description: Return the string name of the ith visible
9393
////////////////////////////////////////////////////////////////////
94-
std::string DNAVisGroup::get_visible_name(uint i) const {
94+
std::string DNAVisGroup::get_visible_name(unsigned int i) const {
9595
nassertr(i < _vis_vector.size(), "");
9696
return _vis_vector[i];
9797
}
@@ -158,7 +158,7 @@ int DNAVisGroup::get_num_suit_edges() const {
158158
// Access: Public
159159
// Description: Return the ith edge in the vector
160160
////////////////////////////////////////////////////////////////////
161-
PT(DNASuitEdge) DNAVisGroup::get_suit_edge(uint i) const {
161+
PT(DNASuitEdge) DNAVisGroup::get_suit_edge(unsigned int i) const {
162162
nassertr(i < _suit_edge_vector.size(), (DNASuitEdge *)NULL);
163163
return _suit_edge_vector[i];
164164
}
@@ -211,7 +211,7 @@ int DNAVisGroup::get_num_battle_cells() const {
211211
// Access: Public
212212
// Description: Return the ith cell in the vector
213213
////////////////////////////////////////////////////////////////////
214-
PT(DNABattleCell) DNAVisGroup::get_battle_cell(uint i) const {
214+
PT(DNABattleCell) DNAVisGroup::get_battle_cell(unsigned int i) const {
215215
nassertr(i < _battle_cell_vector.size(), (DNABattleCell *)NULL);
216216
return _battle_cell_vector[i];
217217
}

‎panda/src/toontown/dna/dnaVisGroup.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ class EXPCL_TOONTOWN DNAVisGroup : public DNAGroup {
4343
void add_visible(const std::string &vis_group_name);
4444
int remove_visible(const std::string &vis_group_name);
4545
int get_num_visibles() const;
46-
std::string get_visible_name(uint i) const;
46+
std::string get_visible_name(unsigned int i) const;
4747

4848
void add_suit_edge(PT(DNASuitEdge) edge);
4949
int remove_suit_edge(PT(DNASuitEdge) edge);
5050
int get_num_suit_edges() const;
51-
PT(DNASuitEdge) get_suit_edge(uint i) const;
51+
PT(DNASuitEdge) get_suit_edge(unsigned int i) const;
5252

5353
void add_battle_cell(PT(DNABattleCell) cell);
5454
int remove_battle_cell(PT(DNABattleCell) cell);
5555
int get_num_battle_cells() const;
56-
PT(DNABattleCell) get_battle_cell(uint i) const;
56+
PT(DNABattleCell) get_battle_cell(unsigned int i) const;
5757

5858
private:
5959
virtual DNAGroup* make_copy();

0 commit comments

Comments
 (0)