RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build on gcc 3.4.3

This commit is contained in:
David Rose 2005-05-16 22:17:54 +00:00
parent 980e41f4a1
commit 61c5bff601
6 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/downloader/httpAuthorization.cxx
View File

@ -258,10 +258,10 @@ base64_decode(const string &s) {
}
for (int i = 0; i < 64; i++) {
base64_invert[base64_table[i]] = i;
base64_invert[(int)base64_table[i]] = i;
}
base64_invert['='] = 0;
base64_invert[(int)'='] = 0;
got_base64_invert = true;
}

4
panda/src/egg/eggGroupNode.cxx
View File

@ -774,9 +774,9 @@ mesh_triangles(int flags) {
int EggGroupNode::
rename_nodes(vector_string strip_prefix, bool recurse) {
int num_renamed = 0;
for (unsigned int ni=0; ni<strip_prefix.size(); ++ ni) {
for (unsigned int ni = 0; ni < strip_prefix.size(); ++ni) {
string axe_name = strip_prefix[ni];
if (this->get_name().find(axe_name)!= -1) {
if (this->get_name().substr(0, axe_name.size()) == axe_name) {
string new_name = this->get_name().substr(axe_name.size());
//cout << "renaming " << this->get_name() << "->" << new_name << endl;
this->set_name(new_name);

10
panda/src/event/buttonEvent.cxx
View File

@ -51,6 +51,10 @@ output(ostream &out) const {
<< TextEncoder::encode_wtext(_candidate_string,
TextEncoder::get_default_encoding());
break;
case T_move:
out << "move";
break;
}
}
@ -86,6 +90,9 @@ write_datagram(Datagram &dg) const {
dg.add_uint16(_highlight_start);
dg.add_uint16(_highlight_end);
dg.add_uint16(_cursor_pos);
case T_move:
break;
}
}
@ -114,5 +121,8 @@ read_datagram(DatagramIterator &scan) {
_highlight_start = scan.get_uint16();
_highlight_end = scan.get_uint16();
_cursor_pos = scan.get_uint16();
case T_move:
break;
}
}

18
panda/src/express/weakPointerTo.I
View File

@ -60,7 +60,7 @@ template<class T>
INLINE TYPENAME WeakPointerTo<T>::To &WeakPointerTo<T>::
operator *() const {
nassertr(!this->was_deleted(), *((To *)NULL));
return *((To *)_void_ptr);
return *((To *)WeakPointerToBase<T>::_void_ptr);
}
////////////////////////////////////////////////////////////////////
@ -72,7 +72,7 @@ template<class T>
INLINE TYPENAME WeakPointerTo<T>::To *WeakPointerTo<T>::
operator -> () const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -89,7 +89,7 @@ template<class T>
INLINE WeakPointerTo<T>::
operator TYPENAME WeakPointerToBase<T>::To *() const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -103,7 +103,7 @@ template<class T>
INLINE TYPENAME WeakPointerTo<T>::To *WeakPointerTo<T>::
p() const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -150,7 +150,7 @@ operator = (const WeakPointerTo<T> &copy) {
template<class T>
INLINE WeakConstPointerTo<T>::
WeakConstPointerTo(const To *ptr) :
WeakPointerToBase<T>((WeakConstPointerTo<T>::To *)ptr)
WeakPointerToBase<T>((TYPENAME WeakConstPointerTo<T>::To *)ptr)
{
}
@ -211,7 +211,7 @@ template<class T>
INLINE const TYPENAME WeakConstPointerTo<T>::To &WeakConstPointerTo<T>::
operator *() const {
nassertr(!this->was_deleted(), *((To *)NULL));
return *((To *)_void_ptr);
return *((To *)WeakPointerToBase<T>::_void_ptr);
}
////////////////////////////////////////////////////////////////////
@ -223,7 +223,7 @@ template<class T>
INLINE const TYPENAME WeakConstPointerTo<T>::To *WeakConstPointerTo<T>::
operator -> () const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -241,7 +241,7 @@ template<class T>
INLINE WeakConstPointerTo<T>::
operator const TYPENAME WeakPointerToBase<T>::To *() const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////
@ -255,7 +255,7 @@ template<class T>
INLINE const TYPENAME WeakConstPointerTo<T>::To *WeakConstPointerTo<T>::
p() const {
nassertr(!this->was_deleted(), (To *)NULL);
return (To *)_void_ptr;
return (To *)WeakPointerToBase<T>::_void_ptr;
}
////////////////////////////////////////////////////////////////////

4
panda/src/pgraph/pandaNode.cxx
View File

@ -373,8 +373,8 @@ PandaNode::
PandaNode::
PandaNode(const PandaNode &copy) :
TypedWritable(copy),
Namable(copy),
ReferenceCount(copy)
ReferenceCount(copy),
Namable(copy)
{
// Copying a node does not copy its children.

10
pandatool/src/maya/mayaShaderColorDef.cxx
View File

@ -333,7 +333,7 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
//maya_cat.debug() << pla[j].name() << " is(pla) " << pla[j].node().apiTypeStr() << endl;
string pla_name = pla[j].name().asChar();
// sometimes, by default, maya gives a outAlpha on subsequent plugs, ignore that
if (pla_name.find("outAlpha") != -1) {
if (pla_name.find("outAlpha") != string::npos) {
maya_cat.debug() << pl.name() << " ignoring: " << pla_name << endl;
continue;
}
@ -342,9 +342,10 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
MayaShaderColorDef *color_p = new MayaShaderColorDef;
color_p->read_surface_color(shader, pla[j].node());
color_p->_texture_name.assign(pla[j].name().asChar());
int loc = color_p->_texture_name.find('.',0);
if( loc != string::npos )
size_t loc = color_p->_texture_name.find('.',0);
if (loc != string::npos) {
color_p->_texture_name.resize(loc);
}
maya_cat.debug() << "uv_name : " << color_p->_texture_name << endl;
}
else {
@ -352,8 +353,9 @@ read_surface_color(MayaShader *shader, MObject color, bool trans) {
read_surface_color(shader, pla[j].node());
_texture_name.assign(pla[j].name().asChar());
int loc = _texture_name.find('.',0);
if( loc != string::npos )
if (loc != string::npos) {
_texture_name.resize(loc);
}
maya_cat.debug() << "uv_name : " << _texture_name << endl;
first = false;
}