kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-02 01:29:36 +00:00
Code Issues Releases Wiki Activity

Move initialization of MaterialInfo in its c'tor

Browse source 
Where it belongs.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-06-08 11:27:50 +01:00
parent b8ab5d533b
commit 6d117e4a23
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/material.cpp
View file

@ -23,7 +23,6 @@
//// ////
#include <cassert> #include <cassert>
#include <cstring>
#include <sstream> #include <sstream>
#include <map> #include <map>
@ -94,7 +93,6 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) {
<< " bytes for material hash table." << std::endl; << " bytes for material hash table." << std::endl;
Application::exit_with_failure(); Application::exit_with_failure();
} }
clear();
} }
@ -102,17 +100,8 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) {
MaterialInfoTable::~MaterialInfoTable() { MaterialInfoTable::~MaterialInfoTable() {
delete [] entries;
delete funcs; delete funcs;
} delete [] entries;
/// MaterialInfoTable::clear() clears a material hash table by setting
/// all entries to 0.
void MaterialInfoTable::clear() {
memset(entries, 0, size * sizeof(MaterialInfo));
} }

7
src/material.h
View file

@ -49,6 +49,8 @@ class MaterialInfo {
friend class MaterialInfoTable; friend class MaterialInfoTable;
public: public:
MaterialInfo() : key(0) { clear(); }
Value mg_value() const; Value mg_value() const;
Value eg_value() const; Value eg_value() const;
ScaleFactor scale_factor(const Position& pos, Color c) const; ScaleFactor scale_factor(const Position& pos, Color c) const;
@ -87,7 +89,6 @@ class MaterialInfoTable {
public: public:
MaterialInfoTable(unsigned numOfEntries); MaterialInfoTable(unsigned numOfEntries);
~MaterialInfoTable(); ~MaterialInfoTable();
void clear();
MaterialInfo* get_material_info(const Position& pos); MaterialInfo* get_material_info(const Position& pos);
private: private:
@ -116,15 +117,15 @@ inline Value MaterialInfo::eg_value() const {
/// MaterialInfo::clear() resets a MaterialInfo object to an empty state, /// MaterialInfo::clear() resets a MaterialInfo object to an empty state,
/// with all slots at their default values. /// with all slots at their default values but the key.
inline void MaterialInfo::clear() { inline void MaterialInfo::clear() {
mgValue = egValue = 0; mgValue = egValue = 0;
factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL); factor[WHITE] = factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL);
spaceWeight = 0;
evaluationFunction = NULL; evaluationFunction = NULL;
scalingFunction[WHITE] = scalingFunction[BLACK] = NULL; scalingFunction[WHITE] = scalingFunction[BLACK] = NULL;
spaceWeight = 0;
} }