Attachment #36134 for bug #45027

View | Details | Raw Unified | Return to bug 45027
Collapse All | Expand All

Lines 96-102 Link Here

(-)scourge-0.5/src/effect.cpp (-1 / +1 lines)
96	if(particle[i]) {	96	if(particle[i]) {
97		97
98	// float c = (((float)particle[i]->life) / ((float)particle[i]->maxLife));	98	// float c = (((float)particle[i]->life) / ((float)particle[i]->maxLife));
99	float c = ((float)abs(particle[i]->z - 8)) / 8.0f;	99	float c = ((float)abs((int)(particle[i]->z - 8))) / 8.0f;
100	if(c > 1) c = 1;	100	if(c > 1) c = 1;
101	glColor4f(c / 2.0f, c, 1.0f, 0.5);	101	glColor4f(c / 2.0f, c, 1.0f, 0.5);
102		102

Lines 117-123 Link Here

(-)scourge-0.5/src/glteleporter.cpp (-1 / +1 lines)
117	float green = (float)((this->color & 0x00ff0000) >> (2 * 8)) / (float)(0xff);	117	float green = (float)((this->color & 0x00ff0000) >> (2 * 8)) / (float)(0xff);
118	float blue = (float)((this->color & 0x0000ff00) >> (1 * 8)) / (float)(0xff);	118	float blue = (float)((this->color & 0x0000ff00) >> (1 * 8)) / (float)(0xff);
119	float max = ((float)(height - 1) / DIV) / 2.0f;	119	float max = ((float)(height - 1) / DIV) / 2.0f;
120	float dist = 1.5f - abs(max - ring[i]) / max;	120	float dist = 1.5f - abs((int)(max - ring[i])) / max;
121	glColor4f(red, green, blue, dist);	121	glColor4f(red, green, blue, dist);
122		122
123	glBegin( GL_QUADS );	123	glBegin( GL_QUADS );

Lines 198-205 Link Here

(-)scourge-0.5/src/mainmenu.cpp (-3 / +3 lines)
198	glPushMatrix();	198	glPushMatrix();
199	glLoadIdentity();	199	glLoadIdentity();
200	glRotatef(logoRot, 0, 0, 1 );	200	glRotatef(logoRot, 0, 0, 1 );
201	glTranslatef( 70, 10 - (abs(logoRot) / 0.25f), 500 );	201	glTranslatef( 70, 10 - (abs((int)logoRot) / 0.25f), 500 );
202	float zoom = (abs(logoRot) / (LOGO_ROT_POS / LOGO_ZOOM)) + 1.0f;	202	float zoom = (abs((int)logoRot) / (LOGO_ROT_POS / LOGO_ZOOM)) + 1.0f;
203	glScalef( zoom, zoom, 1 );	203	glScalef( zoom, zoom, 1 );
204	float w = scourge->getShapePalette()->logo->w;	204	float w = scourge->getShapePalette()->logo->w;
205	float h = scourge->getShapePalette()->logo->h;	205	float h = scourge->getShapePalette()->logo->h;
Lines 242-248 Link Here
242	void MainMenu::addLogoSprite() {	242	void MainMenu::addLogoSprite() {
243	if(logoSpriteCount >= MAX_LOGOS - 1) return;	243	if(logoSpriteCount >= MAX_LOGOS - 1) return;
244	logoSprite[logoSpriteCount].x = 70.0f;	244	logoSprite[logoSpriteCount].x = 70.0f;
245	logoSprite[logoSpriteCount].y = 10 - (abs(logoRot) / 0.25f);	245	logoSprite[logoSpriteCount].y = 10 - (abs((int)logoRot) / 0.25f);
246	logoSprite[logoSpriteCount].angle = 1.0f + (88.0f * rand()/RAND_MAX);	246	logoSprite[logoSpriteCount].angle = 1.0f + (88.0f * rand()/RAND_MAX);
247	logoSprite[logoSpriteCount].quadrant = (int)(4.0f * rand()/RAND_MAX);	247	logoSprite[logoSpriteCount].quadrant = (int)(4.0f * rand()/RAND_MAX);
248	logoSprite[logoSpriteCount].steps = 0;	248	logoSprite[logoSpriteCount].steps = 0;

Lines 1460-1472 Link Here

(-)scourge-0.5/src/map.cpp (-4 / +4 lines)
1460	if(yDiffBigger) {	1460	if(yDiffBigger) {
1461	if(y1 < y2) y += 1.0f;	1461	if(y1 < y2) y += 1.0f;
1462	else y -= 1.0f;	1462	else y -= 1.0f;
1463	if(x1 < x2) x += 1.0f / abs(m);	1463	if(x1 < x2) x += 1.0f / abs((int)m);
1464	else x += -1.0f / abs(m);	1464	else x += -1.0f / abs((int)m);
1465	} else {	1465	} else {
1466	if(x1 < x2) x += 1.0f;	1466	if(x1 < x2) x += 1.0f;
1467	else x -= 1.0f;	1467	else x -= 1.0f;
1468	if(y1 < y2) y += abs(m);	1468	if(y1 < y2) y += abs((int)m);
1469	else y += -1.0 * abs(m);	1469	else y += -1.0 * abs((int)m);
1470	}	1470	}
1471	}	1471	}
1472	// fprintf(stderr, "wall in between? %s\n", (ret ? "TRUE": "FALSE"));	1472	// fprintf(stderr, "wall in between? %s\n", (ret ? "TRUE": "FALSE"));

Lines 797-803 Link Here

(-)scourge-0.5/src/userconfiguration.cpp (-1 / +1 lines)
797	int err = mkdir( path, S_IRWXU\|S_IRGRP\|S_IXGRP );	797	int err = mkdir( path, S_IRWXU\|S_IRGRP\|S_IXGRP );
798	if(err) {	798	if(err) {
799	cerr << "Error creating config directory: " << path << endl;	799	cerr << "Error creating config directory: " << path << endl;
800	cerr << "Error: " << errno << endl;	800	cerr << "Error: " << err << endl;
801	perror("UserConfiguration::createDefaultConfigFile: ");	801	perror("UserConfiguration::createDefaultConfigFile: ");
802	exit(1);	802	exit(1);
803	}	803	}

Return to bug 45027