Mercurial > otakunoraifu

diff window/picture.cc @ 48:ed6c21dde840

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* use correct format (%p) for pointers
author thib
date Wed, 15 Apr 2009 20:28:19 +0000
parents 01aa5ddf7dc8
children 15a18fbe6f21
line wrap: on
line diff
--- a/window/picture.cc
+++ b/window/picture.cc
@@ -130,7 +130,7 @@ void PicBase::Blit(const Rect& rpos_orig
 			Rect clip(surface_x, surface_y, surface_x+surface_w, surface_y+surface_h);
 			rpos.intersect(clip);
 		}
-//if (apos.ty < 200) fprintf(stderr,"Blit: %08x : (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",surface_own,rpos_orig.lx,rpos_orig.ty,rpos_orig.rx,rpos_orig.by,apos.lx,apos.ty,apos.rx,apos.by);
+//if (apos.ty < 200) fprintf(stderr,"Blit: %p : (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",surface_own,rpos_orig.lx,rpos_orig.ty,rpos_orig.rx,rpos_orig.by,apos.lx,apos.ty,apos.rx,apos.by);
 		root->BlitSurface(surface_own, rpos, surface_alpha, surface_alpha_rect, root->surface, apos, attribute);
 		rpos.rmove(-surface_x, -surface_y);
 	} else if (parent == 0) { // 親がいないなら背景消去の責任をもつ
@@ -151,7 +151,7 @@ void PicBase::SimpleBlit(Surface* screen
 		Rect clip(surface_x, surface_y, surface_x+surface_w, surface_y+surface_h);
 		rpos.intersect(clip);
 	}
-//if (apos.ty < 200) fprintf(stderr,"S-Blit: %08x : (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",surface_own,rel_pos.lx,rel_pos.ty,rel_pos.rx,rel_pos.by,apos.lx,apos.ty,apos.rx,apos.by);
+//if (apos.ty < 200) fprintf(stderr,"S-Blit: %p : (%d,%d,%d,%d) -> (%d,%d,%d,%d)\n",surface_own,rel_pos.lx,rel_pos.ty,rel_pos.rx,rel_pos.by,apos.lx,apos.ty,apos.rx,apos.by);
 	root->BlitSurface(surface_own, rpos, surface_alpha, surface_alpha_rect, screen, apos, attribute);
 }
 
@@ -540,7 +540,7 @@ void PicContainer::BlitChildren(Rect rpo
 if (print_blit) fprintf(stderr,"bc.");
 	iterator end = children.end();
 	for (iterator it = children.begin(); it != end; it++) {
-if ( (*it)->is_hidden_now) if(print_blit) fprintf(stderr,"bch %08x;",*it);
+if ( (*it)->is_hidden_now) if(print_blit) fprintf(stderr,"bch %p;",*it);
 		if ( (*it)->is_hidden_now) continue;
 		if ( (*it)->rel_pos.is_crossed(rpos)) {
 			Rect cpos = child_pos(rpos, *it);
@@ -886,7 +886,7 @@ if(print_blit){
 		UpdateItem& item = update_rects[i];
 		Rect& ur = item.apos;
 		if (ur.width() == 0) continue;
-if(print_blit)fprintf(stderr,"%08x: %d,%d,%d,%d",item.pic, item.apos.lx, item.apos.ty, item.apos.rx, item.apos.by);
+if(print_blit)fprintf(stderr,"%p: %d,%d,%d,%d",item.pic, item.apos.lx, item.apos.ty, item.apos.rx, item.apos.by);
 
 		item.pic->ExecReBlit(item.rpos);
 if(print_blit)fprintf(stderr,"\n");
@@ -955,7 +955,7 @@ inline SDL_Rect SDLed(const Rect& rect) 
 #define ALPHA_MAX 255
 #endif
 void PicRoot::BlitSurface(Surface* src, const Rect& src_r, const unsigned char* alpha, const Rect& alpha_r, Surface* dest, const Rect& dest_r, int attribute) const {
-if (print_blit) fprintf(stderr," s %08x %d:%d:%d:%d;",src, dest_r.lx, dest_r.ty, dest_r.rx, dest_r.by);
+if (print_blit) fprintf(stderr," s %p %d:%d:%d:%d;",src, dest_r.lx, dest_r.ty, dest_r.rx, dest_r.by);
 	SDL_Rect sr = SDLed(src_r); SDL_Rect dr = SDLed(dest_r);
 
 	if (attribute & PicBase::BLIT_MULTIPLY) {