No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/funcs.cpp b/util/funcs.cpp
	index bb115a75..1313c3ed 100644
	--- a/util/funcs.cpp
	+++ b/util/funcs.cpp
	@@ -1,64 +1,64 @@
	#include "funcs.h"
	#include <allegro.h>
	#include <vector>
	#include <string>

	using namespace std;

	/*
	inline int rnd( int q ){
	if ( q <= 0 ) return 0;
	return (int)( rand() % q );
	}
	*/

	int Util::rnd( int q, int min, int range ){
	return q - min + rnd( range );
	}

	int Util::rnd( int min, int max ){
	return rnd( max - min ) + min;
	}

	void Util::rest( int x ){
	::rest( x );
	}

	vector< string > Util::getFiles( string dataPath, string find ){
	struct al_ffblk info;
	vector< string > files;

	if ( al_findfirst( (dataPath + find).c_str(), &info, FA_ALL ) != 0 ){
	return files;
	}
	- files.push_back( string( info.name ) );
	+ files.push_back( dataPath + string( info.name ) );
	while ( al_findnext( &info ) == 0 ){
	files.push_back( dataPath + string( info.name ) );
	}
	al_findclose( &info );

	return files;
	}

	void Util::blend_palette( int * pal, int mp, int sc, int ec ) {

	ASSERT( pal );
	ASSERT( mp != 0 );

	int sc_r = getr( sc );
	int sc_g = getg( sc );
	int sc_b = getb( sc );

	int ec_r = getr( ec );
	int ec_g = getg( ec );
	int ec_b = getb( ec );

	for ( int q = 0; q < mp; q++ ) {
	float j = (float)( q ) / (float)( mp );
	int f_r = (int)( 0.5 + (float)( sc_r ) + (float)( ec_r-sc_r ) * j );
	int f_g = (int)( 0.5 + (float)( sc_g ) + (float)( ec_g-sc_g ) * j );
	int f_b = (int)( 0.5 + (float)( sc_b ) + (float)( ec_b-sc_b ) * j );
	pal[q] = makecol( f_r, f_g, f_b );
	}

	}